Parcourir la source

cmLocalGenerator: Compute object max path on construction.

Stephen Kelly il y a 10 ans
Parent
commit
8bfff68642
3 fichiers modifiés avec 4 ajouts et 6 suppressions
  1. 0 5
      Source/cmGlobalGenerator.cxx
  2. 2 0
      Source/cmLocalGenerator.cxx
  3. 2 1
      Source/cmLocalGenerator.h

+ 0 - 5
Source/cmGlobalGenerator.cxx

@@ -1257,11 +1257,6 @@ bool cmGlobalGenerator::Compute()
 
 
   unsigned int i;
   unsigned int i;
 
 
-  for (i = 0; i < this->LocalGenerators.size(); ++i)
-    {
-    this->LocalGenerators[i]->ComputeObjectMaxPath();
-    }
-
   // Add generator specific helper commands
   // Add generator specific helper commands
   for (i = 0; i < this->LocalGenerators.size(); ++i)
   for (i = 0; i < this->LocalGenerators.size(); ++i)
     {
     {

+ 2 - 0
Source/cmLocalGenerator.cxx

@@ -54,6 +54,8 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
   this->EmitUniversalBinaryFlags = true;
   this->EmitUniversalBinaryFlags = true;
   this->BackwardsCompatibility = 0;
   this->BackwardsCompatibility = 0;
   this->BackwardsCompatibilityFinal = false;
   this->BackwardsCompatibilityFinal = false;
+
+  this->ComputeObjectMaxPath();
 }
 }
 
 
 cmLocalGenerator::~cmLocalGenerator()
 cmLocalGenerator::~cmLocalGenerator()

+ 2 - 1
Source/cmLocalGenerator.h

@@ -300,7 +300,6 @@ public:
   void CreateEvaluationFileOutputs(const std::string& config);
   void CreateEvaluationFileOutputs(const std::string& config);
   void ProcessEvaluationFiles(std::vector<std::string>& generatedFiles);
   void ProcessEvaluationFiles(std::vector<std::string>& generatedFiles);
 
 
-  void ComputeObjectMaxPath();
 protected:
 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
   void OutputLinkLibraries(std::string& linkLibraries,
   void OutputLinkLibraries(std::string& linkLibraries,
@@ -360,6 +359,8 @@ private:
   bool GetShouldUseOldFlags(bool shared, const std::string &lang) const;
   bool GetShouldUseOldFlags(bool shared, const std::string &lang) const;
   void AddPositionIndependentFlags(std::string& flags, std::string const& l,
   void AddPositionIndependentFlags(std::string& flags, std::string const& l,
                                    int targetType);
                                    int targetType);
+
+  void ComputeObjectMaxPath();
 };
 };
 
 
 #endif
 #endif