kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Xcode generator should use local generator computation of include directories.

This commit is contained in:
Brad King 2006-02-20 09:54:25 -05:00
parent e16c8d70d0
commit 3fa4a95f56
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1211,8 +1211,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
} }
std::string dirs; std::string dirs;
std::vector<std::string>& includes = std::vector<std::string> includes;
m_CurrentMakefile->GetIncludeDirectories(); m_CurrentLocalGenerator->GetIncludeDirectories(includes);
std::vector<std::string>::iterator i = includes.begin(); std::vector<std::string>::iterator i = includes.begin();
std::string fdirs; std::string fdirs;
std::set<cmStdString> emitted; std::set<cmStdString> emitted;

6
Source/cmLocalGenerator.h
View File

@ -162,6 +162,9 @@ public:
std::vector<cmStdString>& outDirs, std::vector<cmStdString>& outDirs,
std::vector<cmStdString>* fullPathLibs=0); std::vector<cmStdString>* fullPathLibs=0);
/** Get the include flags for the current makefile and language. */
void GetIncludeDirectories(std::vector<std::string>& dirs);
protected: protected:
/** Construct a script from the given list of command lines. */ /** Construct a script from the given list of command lines. */
std::string ConstructScript(const cmCustomCommandLines& commandLines, std::string ConstructScript(const cmCustomCommandLines& commandLines,
@ -177,9 +180,6 @@ protected:
///! put all the libraries for a target on into the given stream ///! put all the libraries for a target on into the given stream
virtual void OutputLinkLibraries(std::ostream&, cmTarget&, bool relink); virtual void OutputLinkLibraries(std::ostream&, cmTarget&, bool relink);
/** Get the include flags for the current makefile and language. */
void GetIncludeDirectories(std::vector<std::string>& dirs);
// Expand rule variables in CMake of the type found in language rules // Expand rule variables in CMake of the type found in language rules
void ExpandRuleVariables(std::string& string, void ExpandRuleVariables(std::string& string,
const char* language, const char* language,