Merge pull request #1018 from leapmotion/upd-standard

Upd standard

Author: Jonathan Marsden

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()

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)