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

cmMakefile: Move some preamble out of the Internal method.

Browse Source
This commit is contained in:
Stephen Kelly 2015-04-18 14:50:38 +02:00
parent 6e23a4bddd
commit 05245b4229
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmMakefile.cxx
View File

@ -556,7 +556,15 @@ bool cmMakefile::ReadListFile(const char* listfile,
std::string currentFile std::string currentFile
= this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE"); = this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE");
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", filenametoread.c_str());
this->AddDefinition("CMAKE_CURRENT_LIST_DIR",
cmSystemTools::GetFilenamePath(filenametoread).c_str());
this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE"); this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
this->ListFileStack.push_back(filenametoread);
bool res = this->ReadListFileInternal(filenametoread.c_str(), bool res = this->ReadListFileInternal(filenametoread.c_str(),
noPolicyScope, requireProjectCommand); noPolicyScope, requireProjectCommand);
@ -584,14 +592,6 @@ bool cmMakefile::ReadListFileInternal(const char* filenametoread,
bool noPolicyScope, bool noPolicyScope,
bool requireProjectCommand) bool requireProjectCommand)
{ {
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", filenametoread);
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->AddDefinition("CMAKE_CURRENT_LIST_DIR",
cmSystemTools::GetFilenamePath(filenametoread).c_str());
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
// push the listfile onto the stack
this->ListFileStack.push_back(filenametoread);
cmListFile cacheFile; cmListFile cacheFile;
if( !cacheFile.ParseFile(filenametoread, requireProjectCommand, this) ) if( !cacheFile.ParseFile(filenametoread, requireProjectCommand, this) )
{ {