summaryrefslogtreecommitdiffstats
path: root/Modules/Platform
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-11-06 16:21:55 (GMT)
committerBrad King <brad.king@kitware.com>2012-11-06 16:21:55 (GMT)
commitf058b275477905545fbfd4228c079d91a047bc0f (patch)
tree03e1ff98170da7573f1fe9a5ff9820b3ac14a07f /Modules/Platform
parent511f227e1311211d072f0462091f6b7a0802e123 (diff)
parent15f5764e2ca9cd10fca7f5bb44f631c7c449352e (diff)
downloadCMake-f058b275477905545fbfd4228c079d91a047bc0f.zip
CMake-f058b275477905545fbfd4228c079d91a047bc0f.tar.gz
CMake-f058b275477905545fbfd4228c079d91a047bc0f.tar.bz2
Merge branch 'osx-sysroot-cleanup' into release
Diffstat (limited to 'Modules/Platform')
-rw-r--r--Modules/Platform/Darwin.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index a401762..4e7e99c 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -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.