BUG: Xcode generator should use local generator computation of include directories.
This commit is contained in:
parent
e16c8d70d0
commit
3fa4a95f56
|
@ -1211,8 +1211,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
|
|||
}
|
||||
|
||||
std::string dirs;
|
||||
std::vector<std::string>& includes =
|
||||
m_CurrentMakefile->GetIncludeDirectories();
|
||||
std::vector<std::string> includes;
|
||||
m_CurrentLocalGenerator->GetIncludeDirectories(includes);
|
||||
std::vector<std::string>::iterator i = includes.begin();
|
||||
std::string fdirs;
|
||||
std::set<cmStdString> emitted;
|
||||
|
|
|
@ -162,6 +162,9 @@ public:
|
|||
std::vector<cmStdString>& outDirs,
|
||||
std::vector<cmStdString>* fullPathLibs=0);
|
||||
|
||||
/** Get the include flags for the current makefile and language. */
|
||||
void GetIncludeDirectories(std::vector<std::string>& dirs);
|
||||
|
||||
protected:
|
||||
/** Construct a script from the given list of command lines. */
|
||||
std::string ConstructScript(const cmCustomCommandLines& commandLines,
|
||||
|
@ -177,9 +180,6 @@ protected:
|
|||
///! put all the libraries for a target on into the given stream
|
||||
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
|
||||
void ExpandRuleVariables(std::string& string,
|
||||
const char* language,
|
||||
|
|
Loading…
Reference in New Issue