summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-23 08:50:19 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-06-02 23:03:57 (GMT)
commit17e13f0a2de8dca416521cb5ad9775bf46030c83 (patch)
tree6ae8c0dd2a4a61210d5df6625fd73c7bdefdbf10
parentd3bb5da9294ddbfcc5fddf7ba3dafd2c3e0b32b2 (diff)
downloadCMake-17e13f0a2de8dca416521cb5ad9775bf46030c83.zip
CMake-17e13f0a2de8dca416521cb5ad9775bf46030c83.tar.gz
CMake-17e13f0a2de8dca416521cb5ad9775bf46030c83.tar.bz2
cmMakefile: Simplify CMP0000 handling.
-rw-r--r--Source/cmMakefile.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7c74a0f..f09c8cb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -519,8 +519,10 @@ bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
{
this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
std::string curSrc = this->GetCurrentSourceDirectory();
- return this->ReadListFile(listfile, true,
- curSrc == this->GetHomeDirectory());
+ bool result = this->ReadListFile(listfile, true,
+ curSrc == this->GetHomeDirectory());
+ this->EnforceDirectoryLevelRules();
+ return result;
}
bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
@@ -619,13 +621,6 @@ bool cmMakefile::ReadListFileInternal(const char* filenametoread,
}
}
- // If this is the directory-level CMakeLists.txt file then perform
- // some extra checks.
- if(this->ListFileStack.size() == 1)
- {
- this->EnforceDirectoryLevelRules();
- }
-
return true;
}