diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-21 21:00:44 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-30 21:14:20 (GMT) |
| commit | f346d88d102c627e98f630ae1c9d26cc899f76d8 (patch) | |
| tree | 1c5f85d1edb51594e61757a9e70098e274f144cb /Source | |
| parent | b661403177edb1d22b89cc4a0ea69a8f93ad2ad2 (diff) | |
| download | CMake-f346d88d102c627e98f630ae1c9d26cc899f76d8.zip CMake-f346d88d102c627e98f630ae1c9d26cc899f76d8.tar.gz CMake-f346d88d102c627e98f630ae1c9d26cc899f76d8.tar.bz2 | |
cmMakefile: Avoid invoking EnforceDirectoryLevelRules.
This is part of the CMP0000 implementation and only needs to be invoked
for top-level buildsystem files currently.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 1 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 23ab93d..383984d 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1106,6 +1106,7 @@ void cmGlobalGenerator::Configure() // now do it lg->GetMakefile()->Configure(); + lg->GetMakefile()->EnforceDirectoryLevelRules(); // update the cache entry for the number of local generators, this is used // for progress diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index b9a66d3..87292ea 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -445,7 +445,6 @@ bool cmMakefile::ProcessBuildsystemFile(const char* filename) { scope.Quiet(); } - this->EnforceDirectoryLevelRules(); return true; } diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index ebf33df..aa70c72 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -825,6 +825,8 @@ public: std::string GetExecutionFilePath() const; + void EnforceDirectoryLevelRules() const; + protected: // add link libraries and directories to the target void AddGlobalLinkInformation(const std::string& name, cmTarget& target); @@ -975,9 +977,6 @@ private: cmPolicies::PolicyStatus GetPolicyStatusInternal(cmPolicies::PolicyID id) const; - // Enforce rules about CMakeLists.txt files. - void EnforceDirectoryLevelRules() const; - // CMP0053 == old cmake::MessageType ExpandVariablesInStringOld( std::string& errorstr, |