Skip to content

Commit

Permalink
Merge pull request #20 from leapmotion/fix-typo
Browse files Browse the repository at this point in the history
Fix typos and other cosmetic cleanup
  • Loading branch information
hham committed Sep 27, 2016
2 parents 1548356 + a478db6 commit 1e30465
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
26 changes: 13 additions & 13 deletions standard/StandardProject.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,10 +14,10 @@ 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.
# 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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -119,16 +119,16 @@ 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()

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)
Expand Down
2 changes: 1 addition & 1 deletion standard/standard-configVersion.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions standard/toolchain-android.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ 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()
set(ENV{LLVM_ANDROID_TOOLCHAIN_DIR} ${LLVM_ANDROID_TOOLCHAIN_DIR} CACHE PATH)
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
Expand Down

0 comments on commit 1e30465

Please sign in to comment.