echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers.

Browse Source 
Because all external callers of this method pass a null first
parameter, this change has no effect for them.

This also makes it obvious that the CMAKE_PARENT_LIST_FILE is set to
the name of the file being read itself for CMakeLists.txt files,
which may not make any sense.
This commit is contained in:
Stephen Kelly 2015-04-18 14:50:36 +02:00
parent 3a8ac2423e
commit 5d4480a8c7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmMakefile.cxx
View File

@ -524,12 +524,14 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
bool cmMakefile::ProcessBuildsystemFile(const char* listfile) bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
{ {
this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
return this->ReadListFile(listfile, 0, true, return this->ReadListFile(listfile, 0, true,
this->cmStartDirectory == this->cmHomeDirectory); this->cmStartDirectory == this->cmHomeDirectory);
} }
bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope) bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
{ {
this->AddDefinition("CMAKE_PARENT_LIST_FILE", this->GetCurrentListFile());
return this->ReadListFile(this->GetCurrentListFile(), listfile, return this->ReadListFile(this->GetCurrentListFile(), listfile,
noPolicyScope); noPolicyScope);
} }
@ -572,7 +574,6 @@ bool cmMakefile::ReadListFile(const char* filename_in,
std::string currentFile std::string currentFile
= this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE"); = this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE");
this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename_in);
this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE"); this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
bool res = this->ReadListFileInternal(filenametoread.c_str(), bool res = this->ReadListFileInternal(filenametoread.c_str(),