Merge branch 'master' of github.com:LaurentGomila/SFML

This commit is contained in:
Laurent Gomila 2012-01-03 18:03:03 +01:00
commit 7a8b32c897

View File

@ -89,13 +89,13 @@ if(MACOSX)
sfml_set_option(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk" 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.") 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" sfml_set_option(CMAKE_OSX_DEPLOYMENT_TARGET "10.5"
STRING "Minimum OS X version to target for deployment (at runtime); ewer APIs weak linked.") STRING "Minimum OS X version to target for deployment (at runtime), newer APIs weak linked.")
elseif(EXISTS /Developer/SDKs/MacOSX10.6.sdk) elseif(EXISTS /Developer/SDKs/MacOSX10.6.sdk)
# target 10.6 system # target 10.6 system
sfml_set_option(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk" 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.") 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" sfml_set_option(CMAKE_OSX_DEPLOYMENT_TARGET "10.6"
STRING "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked.") STRING "Minimum OS X version to target for deployment (at runtime), newer APIs weak linked.")
else() else()
# use default SDK. # use default SDK.
endif() endif()