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

Only build 64-bit for OS X 10.6 and above #4126 

@jakepetroules: Looks like we use ScreenSaver.framework which is not
available in 64-bit until OS X 10.6
(https://developer.apple.com/library/mac/documentation/UserExperience/Reference/ScreenSaver/ObjC_classic/index.html#//apple_ref/doc/uid/20001822).
I've changed the CMake configuration to only build 64-bit for OS X 10.6
and above. Hopefully everything should work now - try it out!
This commit is contained in:
Nick Bolton 2014-10-23 10:00:11 +01:00
parent c09d2ad91e 67f17a0fda
commit a7a0b0021d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -165,11 +165,15 @@ if (UNIX)
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
message(STATUS "DARWIN_VERSION=${DARWIN_VERSION}") message(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
if (DARWIN_VERSION LESS 9) if (DARWIN_VERSION LESS 9)
# 10.4: Universal (32-bit and 64-bit Intel and PowerPC) # 10.4: Universal (32-bit Intel and PowerPC)
set(CMAKE_OSX_ARCHITECTURES "ppc;ppc64;i386:x86_64" set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
CACHE STRING "" FORCE)
else (DARWIN_VERSION LESS 10)
# 10.5: 32-bit Intel only
set(CMAKE_OSX_ARCHITECTURES "i386"
CACHE STRING "" FORCE) CACHE STRING "" FORCE)
else() else()
# 10.5+: 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()