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

cmMakefile: Simplify condition handling.

This commit is contained in:
Stephen Kelly 2015-06-21 19:44:37 +02:00
parent 5e24ff17a2
commit 384a0dba63
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmMakefile.cxx
View File

@ -564,14 +564,15 @@ bool cmMakefile::ReadListFile(const char* listfile,
this->ListFileStack.push_back(filenametoread); this->ListFileStack.push_back(filenametoread);
cmListFile listFile; cmListFile listFile;
bool res = listFile.ParseFile(filenametoread.c_str(), if (!listFile.ParseFile(filenametoread.c_str(),
requireProjectCommand, this); requireProjectCommand, this))
if (res)
{ {
// add this list file to the list of dependencies return false;
this->ListFiles.push_back(filenametoread);
} }
// add this list file to the list of dependencies
this->ListFiles.push_back(filenametoread);
std::string currentParentFile std::string currentParentFile
= this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE"); = this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE");
std::string currentFile std::string currentFile
@ -585,13 +586,8 @@ bool cmMakefile::ReadListFile(const char* listfile,
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE"); this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR"); this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
if (res) this->ReadListFileInternal(listFile, filenametoread.c_str(), noPolicyScope);
{ this->CheckForUnusedVariables();
this->ReadListFileInternal(listFile, filenametoread.c_str(),
noPolicyScope);
this->CheckForUnusedVariables();
}
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str()); this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str()); this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
@ -601,7 +597,7 @@ bool cmMakefile::ReadListFile(const char* listfile,
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE"); this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR"); this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
return res; return true;
} }
void cmMakefile::ReadListFileInternal(cmListFile const& listFile, void cmMakefile::ReadListFileInternal(cmListFile const& listFile,