diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-21 21:19:50 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-30 21:14:21 (GMT) |
| commit | 0a34ea597a954f49335559108bf3fa3382734657 (patch) | |
| tree | 8749b7c40752024ec25d19ec0841331e637f0987 | |
| parent | be5997ef77dccc866ddb96bdfd2f529f74988eef (diff) | |
| download | CMake-0a34ea597a954f49335559108bf3fa3382734657.zip CMake-0a34ea597a954f49335559108bf3fa3382734657.tar.gz CMake-0a34ea597a954f49335559108bf3fa3382734657.tar.bz2 | |
cmMakefile: Compute the filename processed in a scope.
| -rw-r--r-- | Source/cmMakefile.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 32dd8f5..3aaf8d0 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1658,10 +1658,13 @@ public: class cmMakefile::BuildsystemFileScope { public: - BuildsystemFileScope(cmMakefile* mf, std::string const& filename) + BuildsystemFileScope(cmMakefile* mf) : Makefile(mf), ReportError(true) { - this->Makefile->ListFileStack.push_back(filename); + std::string currentStart = + this->Makefile->StateSnapshot.GetCurrentSourceDirectory(); + currentStart += "/CMakeLists.txt"; + this->Makefile->ListFileStack.push_back(currentStart); this->Makefile->PushPolicyBarrier(); this->Makefile->PushFunctionBlockerBarrier(); } @@ -1694,7 +1697,7 @@ void cmMakefile::Configure() this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentStart.c_str()); { - BuildsystemFileScope scope(this, currentStart); + BuildsystemFileScope scope(this); cmListFile listFile; if (!listFile.ParseFile(currentStart.c_str(), this->IsRootMakefile(), this)) { |