summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-07-18 11:18:34 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-07-18 11:26:06 (GMT)
commit54cc0c0e1f98508892ce653591178c86ff067364 (patch)
tree3ca3b2d3149909d33a60533293aa5837af533ece /Source
parente77c46664c384211294b6bdfef99c92212826cc6 (diff)
downloadCMake-54cc0c0e1f98508892ce653591178c86ff067364.zip
CMake-54cc0c0e1f98508892ce653591178c86ff067364.tar.gz
CMake-54cc0c0e1f98508892ce653591178c86ff067364.tar.bz2
cmMakefile: Port some users of ListFileStack to cmState.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0f55017..f8ac52e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -260,7 +260,7 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
cmListFileContext lfc;
// We are not currently executing a command. Add whatever context
// information we have.
- lfc.FilePath = this->ListFileStack.back();
+ lfc.FilePath = this->GetExecutionFilePath();
if(!this->GetCMakeInstance()->GetIsInTryCompile())
{
@@ -514,7 +514,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
std::ostringstream w;
w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0011) << "\n"
<< "The included script\n "
- << this->Makefile->ListFileStack.back() << "\n"
+ << this->Makefile->GetExecutionFilePath() << "\n"
<< "affects policy settings. "
<< "CMake is implying the NO_POLICY_SCOPE option for compatibility, "
<< "so the effects are applied to the including context.";
@@ -527,7 +527,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
std::ostringstream e;
e << cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0011) << "\n"
<< "The included script\n "
- << this->Makefile->ListFileStack.back() << "\n"
+ << this->Makefile->GetExecutionFilePath() << "\n"
<< "affects policy settings, so it requires this policy to be set.";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
}