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

cmMakefile: Extract conditional code to caller.

Browse Source
This commit is contained in:
Stephen Kelly 2015-04-18 14:50:37 +02:00
parent 7d24854736
commit 95a27267da
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
View File

@ -525,6 +525,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
bool cmMakefile::ProcessBuildsystemFile(const char* listfile) bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
{ {
this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile); this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
this->cmCurrentListFile = listfile;
return this->ReadListFile(listfile, 0, true, return this->ReadListFile(listfile, 0, true,
this->cmStartDirectory == this->cmHomeDirectory); this->cmStartDirectory == this->cmHomeDirectory);
} }
@ -553,11 +554,6 @@ bool cmMakefile::ReadListFile(const char* filename_in,
filenametoread = filename_in; filenametoread = filename_in;
} }
if (!filenametoread.empty())
{
this->cmCurrentListFile = filenametoread;
}
if (external_in) if (external_in)
{ {
filenametoread = filenametoread =