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

cmMakefile: Compute the filename processed in a scope.

This commit is contained in:
Stephen Kelly 2015-06-21 23:19:50 +02:00
parent be5997ef77
commit 0a34ea597a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmMakefile.cxx
View File

@ -1658,10 +1658,13 @@ public:
class cmMakefile::BuildsystemFileScope class cmMakefile::BuildsystemFileScope
{ {
public: public:
BuildsystemFileScope(cmMakefile* mf, std::string const& filename) BuildsystemFileScope(cmMakefile* mf)
: Makefile(mf), ReportError(true) : 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->PushPolicyBarrier();
this->Makefile->PushFunctionBlockerBarrier(); this->Makefile->PushFunctionBlockerBarrier();
} }
@ -1694,7 +1697,7 @@ void cmMakefile::Configure()
this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentStart.c_str()); this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentStart.c_str());
{ {
BuildsystemFileScope scope(this, currentStart); 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))
{ {