From 81eb2c58a17f7e34cda79897ea7dec24bf798dd2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 21 Jun 2015 20:10:02 +0200 Subject: [PATCH] cmMakefile: Simplify filename handling. This method has only one caller. --- Source/cmMakefile.cxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index dee290ce5..7faf67a9a 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;