From 15f5764e2ca9cd10fca7f5bb44f631c7c449352e Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 5 Nov 2012 10:43:46 -0500 Subject: [PATCH] OS X: Fix default CMAKE_OSX_SYSROOT with deployment target Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when one is needed. However, the change forgot that we require a sysroot when a deployment target is requested. Teach Darwin.cmake to choose a default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set. Reported-by: Matthew Brett Reported-by: Bradley Giesbrecht --- Modules/Platform/Darwin.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index a401762e5..4e7e99ca3 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.