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

cmMakefile: Avoid invoking EnforceDirectoryLevelRules. 

This is part of the CMP0000 implementation and only needs to be invoked
for top-level buildsystem files currently.
This commit is contained in:
Stephen Kelly 2015-06-21 23:00:44 +02:00
parent b661403177
commit f346d88d10
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalGenerator.cxx
View File

@ -1106,6 +1106,7 @@ void cmGlobalGenerator::Configure()
// now do it // now do it
lg->GetMakefile()->Configure(); lg->GetMakefile()->Configure();
lg->GetMakefile()->EnforceDirectoryLevelRules();
// update the cache entry for the number of local generators, this is used // update the cache entry for the number of local generators, this is used
// for progress // for progress

1
Source/cmMakefile.cxx
View File

@ -445,7 +445,6 @@ bool cmMakefile::ProcessBuildsystemFile(const char* filename)
{ {
scope.Quiet(); scope.Quiet();
} }
this->EnforceDirectoryLevelRules();
return true; return true;
} }

5
Source/cmMakefile.h
View File

@ -825,6 +825,8 @@ public:
std::string GetExecutionFilePath() const; std::string GetExecutionFilePath() const;
void EnforceDirectoryLevelRules() const;
protected: protected:
// add link libraries and directories to the target // add link libraries and directories to the target
void AddGlobalLinkInformation(const std::string& name, cmTarget& target); void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
@ -975,9 +977,6 @@ private:
cmPolicies::PolicyStatus cmPolicies::PolicyStatus
GetPolicyStatusInternal(cmPolicies::PolicyID id) const; GetPolicyStatusInternal(cmPolicies::PolicyID id) const;
// Enforce rules about CMakeLists.txt files.
void EnforceDirectoryLevelRules() const;
// CMP0053 == old // CMP0053 == old
cmake::MessageType ExpandVariablesInStringOld( cmake::MessageType ExpandVariablesInStringOld(
std::string& errorstr, std::string& errorstr,