diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-06-21 18:10:02 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-06-21 18:10:52 (GMT) |
commit | 81eb2c58a17f7e34cda79897ea7dec24bf798dd2 (patch) | |
tree | edbb7f684f79a791f1aeced950eaf354515a6175 /Source | |
parent | 5c837686287eb22e73af76d2ab7f32d5bf8cb9ec (diff) | |
download | CMake-81eb2c58a17f7e34cda79897ea7dec24bf798dd2.zip CMake-81eb2c58a17f7e34cda79897ea7dec24bf798dd2.tar.gz CMake-81eb2c58a17f7e34cda79897ea7dec24bf798dd2.tar.bz2 |
cmMakefile: Simplify filename handling.
This method has only one caller.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmMakefile.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index dee290c..7faf67a 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -536,21 +536,17 @@ bool cmMakefile::ProcessBuildsystemFile(const char* filename) { this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename); std::string curSrc = this->GetCurrentSourceDirectory(); - std::string filenametoread = - cmSystemTools::CollapseFullPath(filename, - this->GetCurrentSourceDirectory()); - this->ListFileStack.push_back(filenametoread); + this->ListFileStack.push_back(filename); cmListFile listFile; - if (!listFile.ParseFile(filenametoread.c_str(), - curSrc == this->GetHomeDirectory(), this)) + if (!listFile.ParseFile(filename, curSrc == this->GetHomeDirectory(), this)) { return false; } this->PushPolicyBarrier(); - this->ReadListFile(listFile, filenametoread); + this->ReadListFile(listFile, filename); this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured()); this->EnforceDirectoryLevelRules(); return true; |