From 106eaf32fa8adc28fb2f7638dd0f4f8797aeac39 Mon Sep 17 00:00:00 2001 From: Walter Gray Date: Tue, 30 May 2017 11:58:36 -0700 Subject: [PATCH 1/2] Bump the default OSX Deployment target to 10.10 --- standard/StandardProject.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake index 5a723cb62..65273a226 100644 --- a/standard/StandardProject.cmake +++ b/standard/StandardProject.cmake @@ -67,7 +67,7 @@ function(standard_project_preinit) if(_developer_sdk_version) set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${_developer_sdk_version}.sdk" CACHE STRING "Mac OS X build environment" FORCE) if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Mac OS X deployment target" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Mac OS X deployment target" FORCE) endif() endif() endif() From 53bf0b7c33991afc9e499b7d7cc8f1e7921b755b Mon Sep 17 00:00:00 2001 From: Walter Gray Date: Tue, 30 May 2017 18:24:37 -0700 Subject: [PATCH 2/2] fix a copy paste error. thanks @gittyupagain --- standard/standard-configVersion.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard/standard-configVersion.cmake.in b/standard/standard-configVersion.cmake.in index 6e8fc2a73..176bdf2fc 100644 --- a/standard/standard-configVersion.cmake.in +++ b/standard/standard-configVersion.cmake.in @@ -17,7 +17,7 @@ if(DEFINED @ARG_NAME@_ARCHITECTURE) string(REGEX MATCH "amd64|x86_64|x64" @ARG_NAME@_is_x64 ${i}) string(REGEX MATCH "i386|x86" @ARG_NAME@_is_x86 ${i}) string(REGEX MATCH "arm$" @ARG_NAME@_is_arm ${i}) - string(REGEX MATCH "arm64|aarch64" @ARG_NAME@_is_aarch64) + string(REGEX MATCH "arm64|aarch64" @ARG_NAME@_is_aarch64 ${i}) # Classify if(@ARG_NAME@_is_x86)