rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Used Mac Sdk from config to detect Mac version

This commit is contained in:
Xinyu Hou 2014-10-24 17:22:07 +01:00
parent 5b4e46f8ea
commit 4f51d5fa50
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -161,19 +161,19 @@ if (UNIX)
endif() endif()
if (APPLE) if (APPLE)
exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) message(STATUS "OSX_TARGET_MAJOR=${OSX_TARGET_MAJOR}")
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) message(STATUS "OSX_TARGET_MINOR=${OSX_TARGET_MINOR}")
message(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
if (DARWIN_VERSION LESS 9) if (NOT (OSX_TARGET_MAJOR EQUAL 10))
# 10.4: Universal (32-bit Intel and PowerPC) message(FATAL_ERROR "Mac OS X target must be 10.x")
endif ()
if (OSX_TARGET_MINOR LESS 6)
# <= 10.5: 32-bit Intel and PowerPC
set(CMAKE_OSX_ARCHITECTURES "ppc;i386" set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
CACHE STRING "" FORCE) CACHE STRING "" FORCE)
elseif (DARWIN_VERSION LESS 10)
# 10.5: 32-bit Intel only
set(CMAKE_OSX_ARCHITECTURES "i386"
CACHE STRING "" FORCE)
else() else()
# 10.6+: Intel only # >= 10.6: Intel only
set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" set(CMAKE_OSX_ARCHITECTURES "i386;x86_64"
CACHE STRING "" FORCE) CACHE STRING "" FORCE)
endif() endif()

6
ext/toolchain/commands1.py
View File

@ -451,9 +451,15 @@ class InternalCommands:
cmake_args += ' -DCMAKE_BUILD_TYPE=' + target.capitalize() cmake_args += ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
elif sys.platform == "darwin": elif sys.platform == "darwin":
macSdkMatch = re.match("(\d+)\.(\d+)", self.macSdk)
if not macSdkMatch:
raise Exception("unknown osx version: " + self.macSdk)
sdkDir = self.getMacSdkDir() sdkDir = self.getMacSdkDir()
cmake_args += " -DCMAKE_OSX_SYSROOT=" + sdkDir cmake_args += " -DCMAKE_OSX_SYSROOT=" + sdkDir
cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macSdk cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macSdk
cmake_args += " -DOSX_TARGET_MAJOR=" + macSdkMatch.group(1)
cmake_args += " -DOSX_TARGET_MINOR=" + macSdkMatch.group(2)
# if not visual studio, use parent dir # if not visual studio, use parent dir
sourceDir = generator.getSourceDir() sourceDir = generator.getSourceDir()