kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Simplify filename handling. 

This method has only one caller.
This commit is contained in:
Stephen Kelly 2015-06-21 20:10:02 +02:00
parent 5c83768628
commit 81eb2c58a1
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmMakefile.cxx
View File

@ -536,21 +536,17 @@ bool cmMakefile::ProcessBuildsystemFile(const char* filename)
{ {
this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename); this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename);
std::string curSrc = this->GetCurrentSourceDirectory(); 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; cmListFile listFile;
if (!listFile.ParseFile(filenametoread.c_str(), if (!listFile.ParseFile(filename, curSrc == this->GetHomeDirectory(), this))
curSrc == this->GetHomeDirectory(), this))
{ {
return false; return false;
} }
this->PushPolicyBarrier(); this->PushPolicyBarrier();
this->ReadListFile(listFile, filenametoread); this->ReadListFile(listFile, filename);
this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured()); this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured());
this->EnforceDirectoryLevelRules(); this->EnforceDirectoryLevelRules();
return true; return true;