Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a part of CMake script that doesn't work any more.

Browse Source 
No attempt to fix this part of the script is made because it change too
often (at each OS release) and no gain would result from a potential
fix.

SDKs are not stored in /Developer anymore with recent versions of Xcode.

Now the users should manually set the following variables :
 - CMAKE_OSX_SYSROOT,
 - CMAKE_OSX_DEPLOYMENT_TARGET,
 - CMAKE_OSX_ARCHITECTURES
This commit is contained in:
Marco Antognini 2013-01-19 11:23:12 +01:00
parent b4941d0f9e
commit 538d49aace
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
CMakeLists.txt
View File

@ -84,36 +84,7 @@ set(CMAKE_SKIP_BUILD_RPATH TRUE)
# Setup Mac OS X stuff # Setup Mac OS X stuff
if(MACOSX) if(MACOSX)
# multi arch support - by default : i386 and x86_64 # SFML_BUILD_FRAMEWORKS needs two things :
sfml_set_option(CMAKE_OSX_ARCHITECTURES "i386;x86_64" STRING "Build architectures for OSX")
# multi SDK support - by default we choose the older SDK available starting by 10.5 SDK
if(NOT OSX_CONFIG_HAS_BEEN_RUN_BEFORE)
if(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
# target 10.5 system
sfml_set_option(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk"
STRING "The product will be built against the headers and libraries located inside the indicated SDK. Set to empty string for default value.")
sfml_set_option(CMAKE_OSX_DEPLOYMENT_TARGET "10.5"
STRING "Minimum OS X version to target for deployment (at runtime), newer APIs weak linked.")
elseif(EXISTS /Developer/SDKs/MacOSX10.6.sdk)
# target 10.6 system
sfml_set_option(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk"
STRING "The product will be built against the headers and libraries located inside the indicated SDK. Set to empty string for default value.")
sfml_set_option(CMAKE_OSX_DEPLOYMENT_TARGET "10.6"
STRING "Minimum OS X version to target for deployment (at runtime), newer APIs weak linked.")
else()
# use default SDK.
endif()
# note : we use OSX_CONFIG_HAS_BEEN_RUN_BEFORE to be able to let the user set his/her custom settings
# so we don't always have to FORCE the value of CMAKE_OSX_DEPLOYMENT_TARGET and CMAKE_OSX_SYSROOT
set(OSX_CONFIG_HAS_BEEN_RUN_BEFORE TRUE
CACHE BOOL "Don't edit this value; you should instead empty your cache."
FORCE)
mark_as_advanced(OSX_CONFIG_HAS_BEEN_RUN_BEFORE)
endif()
# BUILD_FRAMEWORKS needs two things :
# first, it's available only for release # first, it's available only for release
# (because cmake currently doesn't allow specifying a custom framework name so XXX-d is not possible) # (because cmake currently doesn't allow specifying a custom framework name so XXX-d is not possible)
# secondly, it works only with BUILD_SHARED_LIBS enabled # secondly, it works only with BUILD_SHARED_LIBS enabled
@ -197,7 +168,7 @@ else()
# add the remaining headers # add the remaining headers
add_custom_command(TARGET SFML add_custom_command(TARGET SFML
POST_BUILD POST_BUILD
COMMAND cp -r ${PROJECT_SOURCE_DIR}/include/SFML/* SFML.framework/Versions/2.0.0/Headers) COMMAND cp -r ${PROJECT_SOURCE_DIR}/include/SFML/* SFML.framework/Versions/${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/Headers)
# adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle # adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle
# NOTE : it's not required to link agains SFML.framework # NOTE : it's not required to link agains SFML.framework