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

cmMakefile: Port some users of ListFileStack to cmState.

This commit is contained in:
Stephen Kelly 2015-07-18 13:18:34 +02:00
parent e77c46664c
commit 54cc0c0e1f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
View File

@ -260,7 +260,7 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
cmListFileContext lfc; cmListFileContext lfc;
// We are not currently executing a command. Add whatever context // We are not currently executing a command. Add whatever context
// information we have. // information we have.
lfc.FilePath = this->ListFileStack.back(); lfc.FilePath = this->GetExecutionFilePath();
if(!this->GetCMakeInstance()->GetIsInTryCompile()) if(!this->GetCMakeInstance()->GetIsInTryCompile())
{ {
@ -514,7 +514,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
std::ostringstream w; std::ostringstream w;
w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0011) << "\n" w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0011) << "\n"
<< "The included script\n " << "The included script\n "
<< this->Makefile->ListFileStack.back() << "\n" << this->Makefile->GetExecutionFilePath() << "\n"
<< "affects policy settings. " << "affects policy settings. "
<< "CMake is implying the NO_POLICY_SCOPE option for compatibility, " << "CMake is implying the NO_POLICY_SCOPE option for compatibility, "
<< "so the effects are applied to the including context."; << "so the effects are applied to the including context.";
@ -527,7 +527,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
std::ostringstream e; std::ostringstream e;
e << cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0011) << "\n" e << cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0011) << "\n"
<< "The included script\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."; << "affects policy settings, so it requires this policy to be set.";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
} }