diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-18 12:50:37 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-18 13:31:17 (GMT) |
| commit | 7d248547361bbacb4f5b532ef2ce4f4935c97dc8 (patch) | |
| tree | 9f4b1fb866e2c8f4f7c2146eb6a0f414be12f751 /Source | |
| parent | 9db15954104455fef54d59c7aa029d798075bf0e (diff) | |
| download | CMake-7d248547361bbacb4f5b532ef2ce4f4935c97dc8.zip CMake-7d248547361bbacb4f5b532ef2ce4f4935c97dc8.tar.gz CMake-7d248547361bbacb4f5b532ef2ce4f4935c97dc8.tar.bz2 | |
cmMakefile: Remove intermediate variable.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 9b2ee35..d3ea55a 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -532,11 +532,10 @@ bool cmMakefile::ProcessBuildsystemFile(const char* listfile) bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope) { this->AddDefinition("CMAKE_PARENT_LIST_FILE", this->GetCurrentListFile()); - std::string filenametoread = + this->cmCurrentListFile = cmSystemTools::CollapseFullPath(listfile, this->cmStartDirectory.c_str()); - this->cmCurrentListFile = filenametoread; - return this->ReadListFile(0, filenametoread.c_str(), + return this->ReadListFile(0, this->cmCurrentListFile.c_str(), noPolicyScope); } |