kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OS X: Further improve default CMAKE_OSX_SYSROOT selection 

Since commit 230ea218 (OS X: Improve default CMAKE_OSX_SYSROOT
selection, 2012-09-21) we always set CMAKE_OSX_SYSROOT if any SDK is
found in order to support Makefile generator builds with Xcode >= 4.3
without the command-line tools installed.  However, in the basic
POSIX-only case of the Makefile generator with command-line tools and no
CMAKE_OSX_ARCHITECTURES we should not select any SDK by default.
This commit is contained in:
Brad King 2012-09-21 14:35:29 -04:00
parent 2690738458
commit 43b74793de
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Platform/Darwin.cmake
View File

@ -106,7 +106,9 @@ elseif(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND
(NOT "x$ENV{SDKROOT}" MATCHES "/" OR IS_DIRECTORY "$ENV{SDKROOT}")) (NOT "x$ENV{SDKROOT}" MATCHES "/" OR IS_DIRECTORY "$ENV{SDKROOT}"))
# Use the value of SDKROOT from the environment. # Use the value of SDKROOT from the environment.
set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}") set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}")
else() elseif("${CMAKE_GENERATOR}" MATCHES Xcode
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. # Find installed SDKs in either Xcode-4.3+ or pre-4.3 SDKs directory.
set(_CMAKE_OSX_SDKS_DIR "") set(_CMAKE_OSX_SDKS_DIR "")
if(OSX_DEVELOPER_ROOT) if(OSX_DEVELOPER_ROOT)