diff options
| author | David Cole <david.cole@kitware.com> | 2012-09-25 15:18:24 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-09-25 15:18:24 -0400 |
| commit | 021e66a25c86a293fb3ad19650b9fc4a80030875 (patch) | |
| tree | 2f362f327b3b02e2829e16e3cdaef9b6a3e64df8 /Modules/Platform/Darwin-Clang.cmake | |
| parent | 5549334a99024d98e72a445b3d9487732ebd29c7 (diff) | |
| parent | df928646bae077d0b827116f93a64062e8bd1731 (diff) | |
| download | cmake-021e66a25c86a293fb3ad19650b9fc4a80030875.tar.gz | |
Merge topic 'osx-sysroot-cleanup'
df92864 OS X: Ignore MACOSX_DEPLOYMENT_TARGET during Xcode compiler id
e7e613e OS X: Teach deployment target sanity check about SDK names
43b7479 OS X: Further improve default CMAKE_OSX_SYSROOT selection
2690738 OS X: If CMAKE_OSX_SYSROOT is already set do not compute default
7995722 OS X: Simplify selection of CMAKE_OSX_ARCHITECTURES
1786b12 OS X: Allow CMAKE_OSX_SYSROOT to be a logical SDK name
242f673 Tests/Assembler: Use CMAKE_OSX_SYSROOT to generate .s file
a1c032b bootstrap: Suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot
230ea21 OS X: Improve default CMAKE_OSX_SYSROOT selection
a0a0877 OS X: Always generate -isysroot if any SDK is in use
33a60e6 Xcode: Remove unused code reading CMAKE_OSX_SYSROOT_DEFAULT
Diffstat (limited to 'Modules/Platform/Darwin-Clang.cmake')
| -rw-r--r-- | Modules/Platform/Darwin-Clang.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Darwin-Clang.cmake b/Modules/Platform/Darwin-Clang.cmake index 46f06f7688..de7a85636d 100644 --- a/Modules/Platform/Darwin-Clang.cmake +++ b/Modules/Platform/Darwin-Clang.cmake @@ -21,6 +21,6 @@ set(__DARWIN_COMPILER_CLANG 1) macro(__darwin_compiler_clang lang) set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-dynamiclib -Wl,-headerpad_max_install_names") set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle -Wl,-headerpad_max_install_names") + set(CMAKE_${lang}_SYSROOT_FLAG "-isysroot") set(CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG "-mmacosx-version-min=") - set(CMAKE_${lang}_HAS_ISYSROOT 1) endmacro() |