From 3fa4a95f563feee42a2ffdfae5a972ddd864066e Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 20 Feb 2006 09:54:25 -0500 Subject: BUG: Xcode generator should use local generator computation of include directories. --- Source/cmGlobalXCodeGenerator.cxx | 4 ++-- 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& includes = - m_CurrentMakefile->GetIncludeDirectories(); + std::vector includes; + m_CurrentLocalGenerator->GetIncludeDirectories(includes); std::vector::iterator i = includes.begin(); std::string fdirs; std::set 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& outDirs, std::vector* fullPathLibs=0); + /** Get the include flags for the current makefile and language. */ + void GetIncludeDirectories(std::vector& 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& dirs); - // Expand rule variables in CMake of the type found in language rules void ExpandRuleVariables(std::string& string, const char* language, -- cgit v0.12