diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-13 15:21:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-13 15:22:06 (GMT) |
| commit | 24d143e0f639f1d12789ea2a77fedb769ccc1d42 (patch) | |
| tree | d36bb13f06220eae2c596e8023014574f2f72c0e /Modules | |
| parent | ed16d474ea013c4725a46a54ffbcd2ed5dd26ace (diff) | |
| parent | 7347e2f830b75dae94535b64d3925b55b098d88b (diff) | |
| download | CMake-24d143e0f639f1d12789ea2a77fedb769ccc1d42.zip CMake-24d143e0f639f1d12789ea2a77fedb769ccc1d42.tar.gz CMake-24d143e0f639f1d12789ea2a77fedb769ccc1d42.tar.bz2 | |
Merge topic 'objc-visibility-inlines'
7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4199
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/AppleClang-OBJCXX.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/GNU-OBJC.cmake | 4 | ||||
| -rw-r--r-- | Modules/Compiler/GNU-OBJCXX.cmake | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/Modules/Compiler/AppleClang-OBJCXX.cmake b/Modules/Compiler/AppleClang-OBJCXX.cmake index 7c6f763..2c084af 100644 --- a/Modules/Compiler/AppleClang-OBJCXX.cmake +++ b/Modules/Compiler/AppleClang-OBJCXX.cmake @@ -1,5 +1,7 @@ include(Compiler/Clang-OBJCXX) +set(CMAKE_OBJCXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") + if(NOT CMAKE_OBJCXX_COMPILER_VERSION VERSION_LESS 4.0) set(CMAKE_OBJCXX98_STANDARD_COMPILE_OPTION "-std=c++98") set(CMAKE_OBJCXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98") diff --git a/Modules/Compiler/GNU-OBJC.cmake b/Modules/Compiler/GNU-OBJC.cmake index 5fba801..fb9b0b2 100644 --- a/Modules/Compiler/GNU-OBJC.cmake +++ b/Modules/Compiler/GNU-OBJC.cmake @@ -1,6 +1,2 @@ include(Compiler/GNU) __compiler_gnu(OBJC) - -if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2) - set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") -endif() diff --git a/Modules/Compiler/GNU-OBJCXX.cmake b/Modules/Compiler/GNU-OBJCXX.cmake index 66a547e..06f0244 100644 --- a/Modules/Compiler/GNU-OBJCXX.cmake +++ b/Modules/Compiler/GNU-OBJCXX.cmake @@ -1,8 +1,8 @@ include(Compiler/GNU) -__compiler_gnu(OBJC) +__compiler_gnu(OBJCXX) -if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2) - set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") +if(NOT CMAKE_OBJCXX_COMPILER_VERSION VERSION_LESS 4.2) + set(CMAKE_OBJCXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") endif() if(NOT CMAKE_OBJCXX_LINK_FLAGS) |