Преглед на файлове

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

Brad King преди 19 години
родител
ревизия
3fa4a95f56
променени са 2 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 2 2
      Source/cmGlobalXCodeGenerator.cxx
  2. 3 3
      Source/cmLocalGenerator.h

+ 2 - 2
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;

+ 3 - 3
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,