From d6dd264671a10da9c942361b1559d757c35fa0ae Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 16 Oct 2013 13:41:47 +0200 Subject: [PATCH 1/5] include(): Use lower case and () to refer to the include() command. --- Source/cmIncludeCommand.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index 5b931713c..e8ee33fd3 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; From 2d4ce8054900216f554dede6dec843741e8c97f5 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 17 Oct 2013 19:15:52 +0200 Subject: [PATCH 2/5] cmPolicies: Fix typo Use American spelling: behaviour -> behavior. --- Help/policy/CMP0017.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/policy/CMP0017.rst b/Help/policy/CMP0017.rst index c93e8b2ef..f74e6f0cf 100644 --- a/Help/policy/CMP0017.rst +++ b/Help/policy/CMP0017.rst @@ -11,7 +11,7 @@ the modules belonging to CMake always get those files included which they expect, and against which they were developed and tested. In all other cases, the files found in CMAKE_MODULE_PATH still take precedence over the ones in the CMake module directory. The OLD -behaviour is to always prefer files from CMAKE_MODULE_PATH over files +behavior is to always prefer files from CMAKE_MODULE_PATH over files from the CMake modules directory. This policy was introduced in CMake version 2.8.4. CMake version From 620b0e92fce77ccdfc2f35485e31dcdf756962d5 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 17 Oct 2013 21:40:51 +0200 Subject: [PATCH 3/5] target_link_libraries(): Fix code snippet in documentation. The porting script seems to have made a mistake here. --- Help/command/target_link_libraries.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst index a1e3e22ba..41265fdf2 100644 --- a/Help/command/target_link_libraries.rst +++ b/Help/command/target_link_libraries.rst @@ -59,10 +59,11 @@ for : If an is a library in a Mac OX framework, the Headers directory of the framework will also be processed as a "usage requirement". This has the same effect as passing the framework directory as an -include directory. target_link_libraries( +include directory. :: + target_link_libraries( ... [ ... ] ...]) From af2a3ab691140b67cccb67a9417738c5fd502cfb Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 18 Oct 2013 17:07:59 +0200 Subject: [PATCH 4/5] cmTarget: Remove unused variable. --- Source/cmTarget.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index b6182abfd..cab7e7c98 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; From 187385a8edaaf907e449478706240236a84cd266 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 20 Oct 2013 12:29:15 +0200 Subject: [PATCH 5/5] cmCoreTryCompile: Fix typo in comments. Add 'S' to match actual variable names. --- Source/cmCoreTryCompile.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index bc4bf184e..0ac969b62 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -372,8 +372,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector 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.