Merge topic 'minor_cleanup'
6931999
VS6: Add some delimiting between error message and content.d1a5f12
cmTarget: Fix typo in comment.961c0ba
Fix comments to match the code.7cca50c
Remove unused include.
This commit is contained in:
commit
2e7ba290a5
|
@ -1617,7 +1617,7 @@ bool cmDocumentation::PrintDocumentationSinglePolicy(std::ostream& os)
|
|||
return true;
|
||||
}
|
||||
|
||||
// Argument was not a command. Complain.
|
||||
// Argument was not a policy. Complain.
|
||||
os << "Argument \"" << this->CurrentArgument.c_str()
|
||||
<< "\" to --help-policy is not a CMake policy.\n";
|
||||
return false;
|
||||
|
@ -1639,7 +1639,7 @@ bool cmDocumentation::PrintDocumentationSingleVariable(std::ostream& os)
|
|||
return true;
|
||||
}
|
||||
|
||||
// Argument was not a command. Complain.
|
||||
// Argument was not a variable. Complain.
|
||||
os << "Argument \"" << this->CurrentArgument.c_str()
|
||||
<< "\" to --help-variable is not a defined variable. "
|
||||
<< "Use --help-variable-list to see all defined variables.\n";
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include "cmNinjaTargetGenerator.h"
|
||||
#include "cmGeneratedFileStream.h"
|
||||
#include "cmSourceFile.h"
|
||||
#include "cmComputeLinkInformation.h"
|
||||
#include "cmake.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
|
|
@ -147,7 +147,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
|
|||
this->SetBuildType(UTILITY, l->first.c_str(), l->second);
|
||||
break;
|
||||
default:
|
||||
cmSystemTools::Error("Bad target type", l->first.c_str());
|
||||
cmSystemTools::Error("Bad target type: ", l->first.c_str());
|
||||
break;
|
||||
}
|
||||
// INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
|
||||
|
@ -165,7 +165,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
|
|||
dir += l->first.substr(0, pos);
|
||||
if(!cmSystemTools::MakeDirectory(dir.c_str()))
|
||||
{
|
||||
cmSystemTools::Error("Error creating directory ", dir.c_str());
|
||||
cmSystemTools::Error("Error creating directory: ", dir.c_str());
|
||||
}
|
||||
}
|
||||
this->CreateSingleDSP(l->first.c_str(),l->second);
|
||||
|
|
|
@ -4131,7 +4131,7 @@ const char *cmTarget::GetProperty(const char* prop,
|
|||
}
|
||||
else
|
||||
{
|
||||
// Support "<CONFIG>_LOCATION" for compatiblity.
|
||||
// Support "<CONFIG>_LOCATION" for compatibility.
|
||||
int len = static_cast<int>(strlen(prop));
|
||||
if(len > 9 && strcmp(prop+len-9, "_LOCATION") == 0)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue