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

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:
Brad King 2013-10-07 15:43:23 -04:00 committed by CMake Topic Stage
parent 0b7a2034a3 693199999a
commit 2e7ba290a5
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmDocumentation.cxx
View File

@ -1617,7 +1617,7 @@ bool cmDocumentation::PrintDocumentationSinglePolicy(std::ostream& os)
return true; return true;
} }
// Argument was not a command. Complain. // Argument was not a policy. Complain.
os << "Argument \"" << this->CurrentArgument.c_str() os << "Argument \"" << this->CurrentArgument.c_str()
<< "\" to --help-policy is not a CMake policy.\n"; << "\" to --help-policy is not a CMake policy.\n";
return false; return false;
@ -1639,7 +1639,7 @@ bool cmDocumentation::PrintDocumentationSingleVariable(std::ostream& os)
return true; return true;
} }
// Argument was not a command. Complain. // Argument was not a variable. Complain.
os << "Argument \"" << this->CurrentArgument.c_str() os << "Argument \"" << this->CurrentArgument.c_str()
<< "\" to --help-variable is not a defined variable. " << "\" to --help-variable is not a defined variable. "
<< "Use --help-variable-list to see all defined variables.\n"; << "Use --help-variable-list to see all defined variables.\n";

1
Source/cmLocalNinjaGenerator.cxx
View File

@ -17,7 +17,6 @@
#include "cmNinjaTargetGenerator.h" #include "cmNinjaTargetGenerator.h"
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include "cmSourceFile.h" #include "cmSourceFile.h"
#include "cmComputeLinkInformation.h"
#include "cmake.h" #include "cmake.h"
#include <assert.h> #include <assert.h>

4
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -147,7 +147,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
this->SetBuildType(UTILITY, l->first.c_str(), l->second); this->SetBuildType(UTILITY, l->first.c_str(), l->second);
break; break;
default: default:
cmSystemTools::Error("Bad target type", l->first.c_str()); cmSystemTools::Error("Bad target type: ", l->first.c_str());
break; break;
} }
// INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
@ -165,7 +165,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
dir += l->first.substr(0, pos); dir += l->first.substr(0, pos);
if(!cmSystemTools::MakeDirectory(dir.c_str())) 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); this->CreateSingleDSP(l->first.c_str(),l->second);

2
Source/cmTarget.cxx
View File

@ -4131,7 +4131,7 @@ const char *cmTarget::GetProperty(const char* prop,
} }
else else
{ {
// Support "<CONFIG>_LOCATION" for compatiblity. // Support "<CONFIG>_LOCATION" for compatibility.
int len = static_cast<int>(strlen(prop)); int len = static_cast<int>(strlen(prop));
if(len > 9 && strcmp(prop+len-9, "_LOCATION") == 0) if(len > 9 && strcmp(prop+len-9, "_LOCATION") == 0)
{ {