diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-20 14:54:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-20 14:54:25 (GMT) |
| commit | 3fa4a95f563feee42a2ffdfae5a972ddd864066e (patch) | |
| tree | d9ca99f4dd1f408892b97717929cd6351adea49e | |
| parent | e16c8d70d094c139234429d36c271bc375da288b (diff) | |
| download | CMake-3fa4a95f563feee42a2ffdfae5a972ddd864066e.zip CMake-3fa4a95f563feee42a2ffdfae5a972ddd864066e.tar.gz CMake-3fa4a95f563feee42a2ffdfae5a972ddd864066e.tar.bz2 | |
BUG: Xcode generator should use local generator computation of include directories.
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 95be32a..b4637b4 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -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; diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index b90abcc..80afb36 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -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, |