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

cmMakefile: Inline ReadListFileInternal into caller.

Browse Source
This commit is contained in:
Stephen Kelly 2015-06-21 19:57:15 +02:00
parent 254be613b8
commit ad47e6e5bc
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmMakefile.cxx
View File

@ -595,22 +595,6 @@ 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");
this->ReadListFileInternal(listFile);
this->CheckForUnusedVariables();
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
this->AddDefinition("CMAKE_CURRENT_LIST_DIR",
cmSystemTools::GetFilenamePath(currentFile).c_str());
this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
return true;
}
void cmMakefile::ReadListFileInternal(cmListFile const& listFile)
{
// Enforce balanced blocks (if/endif, function/endfunction, etc.). // Enforce balanced blocks (if/endif, function/endfunction, etc.).
LexicalPushPop lexScope(this); LexicalPushPop lexScope(this);
@ -632,6 +616,17 @@ void cmMakefile::ReadListFileInternal(cmListFile const& listFile)
break; break;
} }
} }
this->CheckForUnusedVariables();
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentParentFile.c_str());
this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
this->AddDefinition("CMAKE_CURRENT_LIST_DIR",
cmSystemTools::GetFilenamePath(currentFile).c_str());
this->MarkVariableAsUsed("CMAKE_PARENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE");
this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR");
return true;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
Source/cmMakefile.h
View File

@ -917,8 +917,6 @@ private:
bool ReadListFile(const char* listfile, bool ReadListFile(const char* listfile,
bool requireProjectCommand); bool requireProjectCommand);
void ReadListFileInternal(cmListFile const& listFile);
bool ParseDefineFlag(std::string const& definition, bool remove); bool ParseDefineFlag(std::string const& definition, bool remove);
bool EnforceUniqueDir(const std::string& srcPath, bool EnforceUniqueDir(const std::string& srcPath,