diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-21 13:02:31 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-21 13:02:31 (GMT) |
| commit | 6d1444feacb1c2d621b776ac61412f92ff0a1c34 (patch) | |
| tree | bb67786c603b6fdbfd4a7e17ecc25df0923a15fc /Source | |
| parent | d06610888dd357a7085be0bfff86f5d5d291771d (diff) | |
| parent | 187385a8edaaf907e449478706240236a84cd266 (diff) | |
| download | CMake-6d1444feacb1c2d621b776ac61412f92ff0a1c34.zip CMake-6d1444feacb1c2d621b776ac61412f92ff0a1c34.tar.gz CMake-6d1444feacb1c2d621b776ac61412f92ff0a1c34.tar.bz2 | |
Merge topic 'minor-cleanups'
187385a cmCoreTryCompile: Fix typo in comments.
af2a3ab cmTarget: Remove unused variable.
620b0e9 target_link_libraries(): Fix code snippet in documentation.
2d4ce80 cmPolicies: Fix typo
d6dd264 include(): Use lower case and () to refer to the include() command.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 4 | ||||
| -rw-r--r-- | Source/cmIncludeCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index bc4bf18..0ac969b 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -372,8 +372,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv) } /* for the TRY_COMPILEs we want to be able to specify the architecture. - So the user can set CMAKE_OSX_ARCHITECTURE to i386;ppc and then set - CMAKE_TRY_COMPILE_OSX_ARCHITECTURE first to i386 and then to ppc to + So the user can set CMAKE_OSX_ARCHITECTURES to i386;ppc and then set + CMAKE_TRY_COMPILE_OSX_ARCHITECTURES first to i386 and then to ppc to have the tests run for each specific architecture. Since cmLocalGenerator doesn't allow building for "the other" architecture only via CMAKE_OSX_ARCHITECTURES. diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index 5b93171..e8ee33f 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -19,7 +19,7 @@ bool cmIncludeCommand if (args.size()< 1 || args.size() > 4) { this->SetError("called with wrong number of arguments. " - "Include only takes one file."); + "include() only takes one file."); return false; } bool optional = false; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index b6182ab..cab7e7c 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1990,7 +1990,6 @@ static void processIncludeDirectories(cmTarget *tgt, { case cmPolicies::WARN: { - cmOStringStream w; e << (mf->GetPolicies() ->GetPolicyWarning(cmPolicies::CMP0021)) << "\n"; messageType = cmake::AUTHOR_WARNING; |