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

cmMakefile: Move IncludeScope.

Browse Source
This commit is contained in:
Stephen Kelly 2015-06-21 20:08:30 +02:00
parent 3404f8a081
commit c10ab01434
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmMakefile.cxx
View File

@ -561,14 +561,15 @@ bool cmMakefile::ReadDependentFile(const char* filename, bool noPolicyScope)
cmSystemTools::CollapseFullPath(filename, cmSystemTools::CollapseFullPath(filename,
this->GetCurrentSourceDirectory()); this->GetCurrentSourceDirectory());
IncludeScope incScope(this, noPolicyScope);
this->ListFileStack.push_back(filenametoread); this->ListFileStack.push_back(filenametoread);
cmListFile listFile; cmListFile listFile;
if (!listFile.ParseFile(filenametoread.c_str(), false, this)) if (!listFile.ParseFile(filenametoread.c_str(), false, this))
{ {
incScope.Quiet();
return false; return false;
} }
IncludeScope incScope(this, noPolicyScope);
this->ReadListFile(listFile, filenametoread); this->ReadListFile(listFile, filenametoread);
if(cmSystemTools::GetFatalErrorOccured()) if(cmSystemTools::GetFatalErrorOccured())
{ {