diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-25 22:11:10 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-30 21:14:21 (GMT) |
| commit | 3f5200ec5f17de36d0db1729d61e520fb014abe5 (patch) | |
| tree | 4fa39f7d19a093f3a7f803bbf3831f90552759c4 /Source | |
| parent | 0a34ea597a954f49335559108bf3fa3382734657 (diff) | |
| download | CMake-3f5200ec5f17de36d0db1729d61e520fb014abe5.zip CMake-3f5200ec5f17de36d0db1729d61e520fb014abe5.tar.gz CMake-3f5200ec5f17de36d0db1729d61e520fb014abe5.tar.bz2 | |
cmMakefile: Expand the scope of scoped buildsystem file state.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 3aaf8d0..79f4c44 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1685,6 +1685,7 @@ private: void cmMakefile::Configure() { cmMakefileCurrent cmf(this); + BuildsystemFileScope scope(this); // make sure the CMakeFiles dir is there std::string filesDir = this->StateSnapshot.GetCurrentBinaryDirectory(); @@ -1696,8 +1697,6 @@ void cmMakefile::Configure() assert(cmSystemTools::FileExists(currentStart.c_str(), true)); this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentStart.c_str()); - { - BuildsystemFileScope scope(this); cmListFile listFile; if (!listFile.ParseFile(currentStart.c_str(), this->IsRootMakefile(), this)) { @@ -1709,7 +1708,6 @@ void cmMakefile::Configure() { scope.Quiet(); } - } // at the end handle any old style subdirs std::vector<cmMakefile*> subdirs = this->UnConfiguredDirectories; |