Merge topic 'osx-sysroot-cleanup'

15f5764 OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
This commit is contained in:
Brad King 2012-11-06 14:13:22 -05:00 committed by CMake Topic Stage
commit a574752f84
1 changed files with 1 additions and 0 deletions

View File

@ -107,6 +107,7 @@ elseif(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND
# Use the value of SDKROOT from the environment.
set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}")
elseif("${CMAKE_GENERATOR}" MATCHES Xcode
OR CMAKE_OSX_DEPLOYMENT_TARGET
OR CMAKE_OSX_ARCHITECTURES MATCHES "[^;]"
OR NOT EXISTS "/usr/include/sys/types.h")
# Find installed SDKs in either Xcode-4.3+ or pre-4.3 SDKs directory.