summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-06-21 18:08:30 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-06-21 18:10:52 (GMT)
commitc10ab014344e693a65d7cfbfb9b4e0f8a8b155f9 (patch)
treef60e56dafce14340d742ad842a52fee06df544d8
parent3404f8a081a03441c6747de50f2155ae28115c07 (diff)
downloadCMake-c10ab014344e693a65d7cfbfb9b4e0f8a8b155f9.zip
CMake-c10ab014344e693a65d7cfbfb9b4e0f8a8b155f9.tar.gz
CMake-c10ab014344e693a65d7cfbfb9b4e0f8a8b155f9.tar.bz2
cmMakefile: Move IncludeScope.
-rw-r--r--Source/cmMakefile.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 32767a3..744e848 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -561,14 +561,15 @@ bool cmMakefile::ReadDependentFile(const char* filename, bool noPolicyScope)
cmSystemTools::CollapseFullPath(filename,
this->GetCurrentSourceDirectory());
+ IncludeScope incScope(this, noPolicyScope);
this->ListFileStack.push_back(filenametoread);
cmListFile listFile;
if (!listFile.ParseFile(filenametoread.c_str(), false, this))
{
+ incScope.Quiet();
return false;
}
- IncludeScope incScope(this, noPolicyScope);
this->ReadListFile(listFile, filenametoread);
if(cmSystemTools::GetFatalErrorOccured())
{