diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-11-11 19:35:52 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-04-07 14:48:44 (GMT) |
| commit | 59b5fdd37c87dd27205e3756d17a186e02e0d326 (patch) | |
| tree | cd0f1ce44e52605cb5a0f6531c700d54af698383 | |
| parent | 7f7d6a40302e208d7a082d1800431fc8803c0b79 (diff) | |
| download | CMake-59b5fdd37c87dd27205e3756d17a186e02e0d326.zip CMake-59b5fdd37c87dd27205e3756d17a186e02e0d326.tar.gz CMake-59b5fdd37c87dd27205e3756d17a186e02e0d326.tar.bz2 | |
Don't load Clang-CXX from AppleClang-CXX.
The Clang-CXX module is going to get version-specific checks, and
the version system for AppleClang is not the same as Clang.
| -rw-r--r-- | Modules/Compiler/AppleClang-CXX.cmake | 7 | ||||
| -rw-r--r-- | Modules/Compiler/Clang-CXX.cmake | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake index 680f720..0372e18 100644 --- a/Modules/Compiler/AppleClang-CXX.cmake +++ b/Modules/Compiler/AppleClang-CXX.cmake @@ -1 +1,6 @@ -include(Compiler/Clang-CXX) +include(Compiler/Clang) +__compiler_clang(CXX) + +if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") + set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") +endif() diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake index 0372e18..ab1b766 100644 --- a/Modules/Compiler/Clang-CXX.cmake +++ b/Modules/Compiler/Clang-CXX.cmake @@ -4,3 +4,8 @@ __compiler_clang(CXX) if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") endif() + +cmake_policy(GET CMP0025 appleClangPolicy) +if(NOT appleClangPolicy STREQUAL NEW) + return() +endif() |