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

cmMakefile: Expand the scope of scoped buildsystem file state.

This commit is contained in:
Stephen Kelly 2015-06-26 00:11:10 +02:00
parent 0a34ea597a
commit 3f5200ec5f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMakefile.cxx
View File

@ -1685,6 +1685,7 @@ private:
void cmMakefile::Configure() void cmMakefile::Configure()
{ {
cmMakefileCurrent cmf(this); cmMakefileCurrent cmf(this);
BuildsystemFileScope scope(this);
// make sure the CMakeFiles dir is there // make sure the CMakeFiles dir is there
std::string filesDir = this->StateSnapshot.GetCurrentBinaryDirectory(); std::string filesDir = this->StateSnapshot.GetCurrentBinaryDirectory();
@ -1696,8 +1697,6 @@ void cmMakefile::Configure()
assert(cmSystemTools::FileExists(currentStart.c_str(), true)); assert(cmSystemTools::FileExists(currentStart.c_str(), true));
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentStart.c_str()); this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentStart.c_str());
{
BuildsystemFileScope scope(this);
cmListFile listFile; cmListFile listFile;
if (!listFile.ParseFile(currentStart.c_str(), this->IsRootMakefile(), this)) if (!listFile.ParseFile(currentStart.c_str(), this->IsRootMakefile(), this))
{ {
@ -1709,7 +1708,6 @@ void cmMakefile::Configure()
{ {
scope.Quiet(); scope.Quiet();
} }
}
// at the end handle any old style subdirs // at the end handle any old style subdirs
std::vector<cmMakefile*> subdirs = this->UnConfiguredDirectories; std::vector<cmMakefile*> subdirs = this->UnConfiguredDirectories;