summaryrefslogtreecommitdiffstats
path: root/Source/cmIncludeCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-24 19:31:45 (GMT)
committerBrad King <brad.king@kitware.com>2014-04-24 19:31:45 (GMT)
commitaaa6c8a6cefff2fc8938453f09fb91523b9e87e4 (patch)
treefd186e3ee9ba0c4d514baa27d78b8553bcedcb70 /Source/cmIncludeCommand.cxx
parentfaf291a9c41cc2a4ffa6797c1d35c7863118a4c4 (diff)
parentd64ee80d6bfb97a63953796074e792f4883e5fb2 (diff)
downloadCMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.zip
CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.gz
CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.bz2
Merge branch 'master' into doc-singlehtml
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help options from both sides.
Diffstat (limited to 'Source/cmIncludeCommand.cxx')
-rw-r--r--Source/cmIncludeCommand.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index fbcbc75..0a4f5c9 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -65,7 +65,7 @@ bool cmIncludeCommand
{
std::string errorText = "called with invalid argument: ";
errorText += args[i];
- this->SetError(errorText.c_str());
+ this->SetError(errorText);
return false;
}
}
@@ -121,7 +121,7 @@ bool cmIncludeCommand
"command. It " << modal << " not be used as the argument to the "
"include() command. Use ALIAS targets instead to refer to targets "
"by alternative names.\n";
- this->Makefile->IssueMessage(messageType, e.str().c_str());
+ this->Makefile->IssueMessage(messageType, e.str());
if (messageType == cmake::FATAL_ERROR)
{
return false;
@@ -139,7 +139,7 @@ bool cmIncludeCommand
// add the location of the included file if a result variable was given
if (resultVarName.size())
{
- this->Makefile->AddDefinition(resultVarName.c_str(),
+ this->Makefile->AddDefinition(resultVarName,
readit?fullFilePath.c_str():"NOTFOUND");
}
@@ -149,7 +149,7 @@ bool cmIncludeCommand
"could not find load file:\n"
" ";
m += fname;
- this->SetError(m.c_str());
+ this->SetError(m);
return false;
}
return true;