diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-21 17:57:15 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-21 18:10:50 (GMT) |
| commit | ad47e6e5bc4822dc5bc9d82ae1d7590aee4ece95 (patch) | |
| tree | 24753890a236bfd6e03b64ee65d09d7355e88ad5 | |
| parent | 254be613b803816a918c12d7d7eca40a7c9f7c09 (diff) | |
| download | CMake-ad47e6e5bc4822dc5bc9d82ae1d7590aee4ece95.zip CMake-ad47e6e5bc4822dc5bc9d82ae1d7590aee4ece95.tar.gz CMake-ad47e6e5bc4822dc5bc9d82ae1d7590aee4ece95.tar.bz2 | |
cmMakefile: Inline ReadListFileInternal into caller.
| -rw-r--r-- | Source/cmMakefile.cxx | 27 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 2 |
2 files changed, 11 insertions, 18 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index b02cfc8..c4400d1 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -595,22 +595,6 @@ bool cmMakefile::ReadListFile(const char* listfile, this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_FILE"); 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.). LexicalPushPop lexScope(this); @@ -632,6 +616,17 @@ void cmMakefile::ReadListFileInternal(cmListFile const& listFile) 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; } //---------------------------------------------------------------------------- diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 9896d5b..8ea6e13 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -917,8 +917,6 @@ private: bool ReadListFile(const char* listfile, bool requireProjectCommand); - void ReadListFileInternal(cmListFile const& listFile); - bool ParseDefineFlag(std::string const& definition, bool remove); bool EnforceUniqueDir(const std::string& srcPath, |