kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmLocalGenerator: Compute object max path on construction.

This commit is contained in:
Stephen Kelly 2015-09-19 13:13:54 +02:00
parent 2c2479fbed
commit 8bfff68642
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmGlobalGenerator.cxx
View File

@ -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
Source/cmLocalGenerator.cxx
View File

@ -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()

3
Source/cmLocalGenerator.h
View File

@ -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