diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-07 19:43:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-07 19:43:23 (GMT) |
| commit | 2e7ba290a5bd3a95a7b03d54933d98f087e953d6 (patch) | |
| tree | e049563498f5a80e3ae054bc2d9eb70cf7020914 /Source | |
| parent | 0b7a2034a3b87e80461b4abcf7c316076a16ad0d (diff) | |
| parent | 693199999ae8217314db08748b3e588bd93b21b8 (diff) | |
| download | CMake-2e7ba290a5bd3a95a7b03d54933d98f087e953d6.zip CMake-2e7ba290a5bd3a95a7b03d54933d98f087e953d6.tar.gz CMake-2e7ba290a5bd3a95a7b03d54933d98f087e953d6.tar.bz2 | |
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.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDocumentation.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx index b19d847..58ce36b 100644 --- a/Source/cmDocumentation.cxx +++ b/Source/cmDocumentation.cxx @@ -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"; diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index a522e37..89b05d7 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -17,7 +17,6 @@ #include "cmNinjaTargetGenerator.h" #include "cmGeneratedFileStream.h" #include "cmSourceFile.h" -#include "cmComputeLinkInformation.h" #include "cmake.h" #include <assert.h> diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index e5b4057..f00a937 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -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); diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index b491762..7df599f 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -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) { |