From c5bc33670aae71c1b6f9f4f8471c79d402092db7 Mon Sep 17 00:00:00 2001 From: James Donald Date: Tue, 27 Sep 2016 09:13:33 -0700 Subject: [PATCH 1/7] Fix capitalization in comment --- standard/StandardProject.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake index e03a93cc0..2e20dfc1d 100644 --- a/standard/StandardProject.cmake +++ b/standard/StandardProject.cmake @@ -88,7 +88,7 @@ function(standard_project_preinit) set(CMAKE_DEBUG_POSTFIX "d${CMAKE_DEBUG_POSTFIX}") set(CMAKE_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} PARENT_SCOPE) - # 64-bit installations should suffix with 64 regardless of the CPU type (arm or intel) + # 64-bit installations should suffix with 64 regardless of the CPU type (ARM or Intel) if(CMAKE_SIZEOF_VOID_P EQUAL 8) foreach(config IN LISTS CMAKE_CONFIGURATION_TYPES) string(TOUPPER ${config} config) From 32ed0a5ec27cd6be28f2fe85204f34658a7fd909 Mon Sep 17 00:00:00 2001 From: James Donald Date: Tue, 27 Sep 2016 09:15:57 -0700 Subject: [PATCH 2/7] Fix spelling of compatibility via aspell --- standard/StandardProject.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake index 2e20dfc1d..b1b2aad86 100644 --- a/standard/StandardProject.cmake +++ b/standard/StandardProject.cmake @@ -14,7 +14,7 @@ does the following: * Enforces the project has a VERSION set. ]] -include (CMakeParseArguments) #Backwards compatibilty +include (CMakeParseArguments) #Backwards compatibility #This must be a macro since project defines scope-local variables #that we generally rely on being in the root context. From 97a9db41d5f8e828ee14dc9d486e413a97dfd8eb Mon Sep 17 00:00:00 2001 From: James Donald Date: Tue, 27 Sep 2016 09:16:33 -0700 Subject: [PATCH 3/7] Remove inconsistent space --- standard/StandardProject.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake index b1b2aad86..8011fdd2a 100644 --- a/standard/StandardProject.cmake +++ b/standard/StandardProject.cmake @@ -14,7 +14,7 @@ does the following: * Enforces the project has a VERSION set. ]] -include (CMakeParseArguments) #Backwards compatibility +include(CMakeParseArguments) #Backwards compatibility #This must be a macro since project defines scope-local variables #that we generally rely on being in the root context. From 47ddb778a2710ab53f2c360fbd107fcf6b84ce76 Mon Sep 17 00:00:00 2001 From: James Donald Date: Tue, 27 Sep 2016 09:17:42 -0700 Subject: [PATCH 4/7] Remove inconsistent double-pound --- standard/StandardProject.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake index 8011fdd2a..152a67cbc 100644 --- a/standard/StandardProject.cmake +++ b/standard/StandardProject.cmake @@ -128,7 +128,7 @@ function(standard_project_preinit) endfunction() function(standard_project_postinit) - ##Post-initialization steps. All of these depend on project() having been called. + #Post-initialization steps. All of these depend on project() having been called. include(CTest) if(CMAKE_COMPILER_IS_GNUCC) From 908ad9926612705ebb0fcb68403be8fe14ddb24b Mon Sep 17 00:00:00 2001 From: James Donald Date: Tue, 27 Sep 2016 09:20:52 -0700 Subject: [PATCH 5/7] Fix spacing and more consistency in comment style --- standard/StandardProject.cmake | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake index 152a67cbc..9c5b312bc 100644 --- a/standard/StandardProject.cmake +++ b/standard/StandardProject.cmake @@ -4,7 +4,7 @@ in a particular order around project setup. This function wraps project() and does the following: * Changes CMake around so that the output variables follow the /bin and /lib output - directory convention popular on Gnu. + directory convention popular on GNU. * Ensures that ARM and 64-bit code are built as position-independent code * Verifies that the compiler actually supports C++11 * Sets the correct flags to enable C++11 on all platforms @@ -14,10 +14,10 @@ does the following: * Enforces the project has a VERSION set. ]] -include(CMakeParseArguments) #Backwards compatibility +include(CMakeParseArguments) # Backwards compatibility -#This must be a macro since project defines scope-local variables -#that we generally rely on being in the root context. +# This must be a macro since project defines scope-local variables +# that we generally rely on being in the root context. macro(standard_project project_name) cmake_parse_arguments(standard "" "VERSION" "LANGUAGES" ${ARGN}) if(NOT standard_VERSION) @@ -46,10 +46,10 @@ function(standard_project_preinit) endif() endif() - #These do not strictly *have* to be set prior to project, but they can be so we will - - # Need to classify the architecture before we run anything else, this lets us easily configure the - # find version file based on what the architecture was actually built to be + # These do not strictly *have* to be set prior to project, but they can be so we will + # Need to classify the architecture before we run anything else, this lets us easily + # configure the find version file based on what the architecture was actually built to + # be. if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm") set(standard_BUILD_ARM ON PARENT_SCOPE) set(standard_BUILD_ARCHITECTURES "arm" PARENT_SCOPE) @@ -66,7 +66,7 @@ function(standard_project_preinit) endif() message(STATUS "Using architecture: ${standard_BUILD_ARCHITECTURES}") - # All of our binaries go to one place: The binaries output directory. We only want to tinker + # All of our binaries go to one place: The binaries output directory. We only want to tinker # with this if we're building by ourselves, otherwise we just do whatever the enclosing project # wants us to do. set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin PARENT_SCOPE) @@ -119,8 +119,8 @@ function(standard_project_preinit) endif() endif() - #CMAKE_OSX_DEPLOYMENT_TARGET < 10.9 implies -stdlib=libstdc++, which doesn't have - #complete c++11 support. override with libc++ + # CMAKE_OSX_DEPLOYMENT_TARGET < 10.9 implies -stdlib=libstdc++, which doesn't have + # complete c++11 support. override with libc++ if(DEFINED CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++" PARENT_SCOPE) endif() @@ -128,7 +128,7 @@ function(standard_project_preinit) endfunction() function(standard_project_postinit) - #Post-initialization steps. All of these depend on project() having been called. + # Post-initialization steps. All of these depend on project() having been called. include(CTest) if(CMAKE_COMPILER_IS_GNUCC) From 993d561d299e22b02df0f21bcb8a7ecf3ee7fc58 Mon Sep 17 00:00:00 2001 From: James Donald Date: Tue, 27 Sep 2016 09:25:32 -0700 Subject: [PATCH 6/7] Comment style consistency in other files --- standard/standard-configVersion.cmake.in | 2 +- standard/toolchain-android.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/standard/standard-configVersion.cmake.in b/standard/standard-configVersion.cmake.in index 73741a679..0796e2635 100644 --- a/standard/standard-configVersion.cmake.in +++ b/standard/standard-configVersion.cmake.in @@ -73,7 +73,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") endif() endif() -if(NOT @ARG_VERSION_PRERELEASE@ STREQUAL "") #handle prerelease versions +if(NOT @ARG_VERSION_PRERELEASE@ STREQUAL "") # handle prerelease versions set(PACKAGE_FIND_VERSION_PRERELEASE "${@ARG_NAME@_FIND_VERSION_PRERELEASE}") if(NOT PACKAGE_FIND_VERSION_PRERELEASE) set(PACKAGE_VERSION_COMPATIBLE FALSE) diff --git a/standard/toolchain-android.cmake b/standard/toolchain-android.cmake index 32f0b4462..dcb9200f8 100644 --- a/standard/toolchain-android.cmake +++ b/standard/toolchain-android.cmake @@ -2,9 +2,9 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR arm) set(CMAKE_SYSTEM_VERSION 1) -#For reasons beyond my comprehension, this file is parsed multiple times -#and in some of them, cache variables are not preserved so we have to store -#this in an environmental variable... +# For reasons beyond my comprehension, this file is parsed multiple times +# and in some of them, cache variables are not preserved so we have to store +# this in an environmental variable... if(NOT LLVM_ANDROID_TOOLCHAIN_DIR) set(LLVM_ANDROID_TOOLCHAIN_DIR $ENV{LLVM_ANDROID_TOOLCHAIN_DIR}) else() @@ -12,7 +12,7 @@ else() endif() find_path(ANDROID_NDK_ROOT bin/${ANDROID_NDK_TOOL_PREFIX}-gcc${_exe_suffix} PATHS - ${LLVM_ANDROID_TOOLCHAIN_DIR}${_ndk_suffix} #legacy variable + ${LLVM_ANDROID_TOOLCHAIN_DIR}${_ndk_suffix} # legacy variable /opt/android-standalone-toolchain${_ndk_suffix} ${LLVM_ANDROID_TOOLCHAIN_DIR} /opt/android-standalone-toolchain From a478db63676aef5b4adf16dcc6f71baa0bac1b49 Mon Sep 17 00:00:00 2001 From: James Donald Date: Tue, 27 Sep 2016 09:28:50 -0700 Subject: [PATCH 7/7] Capitalize C++11 --- standard/StandardProject.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake index 9c5b312bc..b020ca3c2 100644 --- a/standard/StandardProject.cmake +++ b/standard/StandardProject.cmake @@ -120,7 +120,7 @@ function(standard_project_preinit) endif() # CMAKE_OSX_DEPLOYMENT_TARGET < 10.9 implies -stdlib=libstdc++, which doesn't have - # complete c++11 support. override with libc++ + # complete C++11 support. Override with libc++ if(DEFINED CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++" PARENT_SCOPE) endif()