diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-14 21:49:10 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-19 20:36:48 (GMT) |
| commit | f3e6a336f29b0675e4eb3852ce7544f3c9342071 (patch) | |
| tree | 4458cc329a64ffa7611347d1be0db1b7ffe7f2ed | |
| parent | 6b9e647239b67aff3119efbe2691fefe9c2dc28b (diff) | |
| download | CMake-f3e6a336f29b0675e4eb3852ce7544f3c9342071.zip CMake-f3e6a336f29b0675e4eb3852ce7544f3c9342071.tar.gz CMake-f3e6a336f29b0675e4eb3852ce7544f3c9342071.tar.bz2 | |
cmMakefile: Remove CurrentListFile member.
It is never read externally. The CollapseFullPath removed in this commit
is a repeat of a similar call inside ReadListFile.
| -rw-r--r-- | Source/cmMakefile.cxx | 7 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 10 |
2 files changed, 1 insertions, 16 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0a112cb..e69c2ba 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -601,7 +601,6 @@ void cmMakefile::IncludeScope::EnforceCMP0011() bool cmMakefile::ProcessBuildsystemFile(const char* listfile) { this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile); - this->cmCurrentListFile = listfile; std::string curSrc = this->GetCurrentSourceDirectory(); return this->ReadListFile(listfile, true, curSrc == this->GetHomeDirectory()); @@ -611,11 +610,7 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope) { this->AddDefinition("CMAKE_PARENT_LIST_FILE", this->GetDefinition("CMAKE_CURRENT_LIST_FILE")); - this->cmCurrentListFile = - cmSystemTools::CollapseFullPath(listfile, - this->GetCurrentSourceDirectory()); - return this->ReadListFile(this->cmCurrentListFile.c_str(), - noPolicyScope); + return this->ReadListFile(listfile, noPolicyScope); } //---------------------------------------------------------------------------- diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 82f2715..2a72cca 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -418,14 +418,6 @@ public: void SetCurrentBinaryDirectory(const std::string& dir); const char* GetCurrentBinaryDirectory() const; - /* Get the current CMakeLists.txt file that is being processed. This - * is just used in order to be able to 'branch' from one file to a second - * transparently */ - const char* GetCurrentListFile() const - { - return this->cmCurrentListFile.c_str(); - } - //@} /** @@ -845,8 +837,6 @@ protected: // Check for a an unused variable void CheckForUnused(const char* reason, const std::string& name) const; - std::string cmCurrentListFile; - std::string ProjectName; // project name // libraries, classes, and executables |