diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-18 12:50:37 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-18 13:31:17 (GMT) |
| commit | 95a27267daee021514df8c93ffd6d9b9e55dea51 (patch) | |
| tree | bf10ce36c074f97c4c4a6362eefa91572f75955b /Source | |
| parent | 7d248547361bbacb4f5b532ef2ce4f4935c97dc8 (diff) | |
| download | CMake-95a27267daee021514df8c93ffd6d9b9e55dea51.zip CMake-95a27267daee021514df8c93ffd6d9b9e55dea51.tar.gz CMake-95a27267daee021514df8c93ffd6d9b9e55dea51.tar.bz2 | |
cmMakefile: Extract conditional code to caller.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index d3ea55a..bc225ff 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -525,6 +525,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011() bool cmMakefile::ProcessBuildsystemFile(const char* listfile) { this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile); + this->cmCurrentListFile = listfile; return this->ReadListFile(listfile, 0, true, this->cmStartDirectory == this->cmHomeDirectory); } @@ -553,11 +554,6 @@ bool cmMakefile::ReadListFile(const char* filename_in, filenametoread = filename_in; } - if (!filenametoread.empty()) - { - this->cmCurrentListFile = filenametoread; - } - if (external_in) { filenametoread = |