Commit 01bdc2cc authored by Brad King's avatar Brad King 💬 Committed by Kitware Robot
Browse files

Merge topic 'geh-visibility-flag'

9eb05b48

 GenerateExportHeader: always fill in _EXPORT macros

Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !36
parents e145cfe2 9eb05b48
...@@ -215,9 +215,6 @@ macro(_test_compiler_hidden_visibility) ...@@ -215,9 +215,6 @@ macro(_test_compiler_hidden_visibility)
check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY) check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
check_cxx_compiler_flag(-fvisibility-inlines-hidden check_cxx_compiler_flag(-fvisibility-inlines-hidden
COMPILER_HAS_HIDDEN_INLINE_VISIBILITY) COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
option(USE_COMPILER_HIDDEN_VISIBILITY
"Use HIDDEN visibility support if available." ON)
mark_as_advanced(USE_COMPILER_HIDDEN_VISIBILITY)
endif() endif()
endmacro() endmacro()
...@@ -267,7 +264,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY) ...@@ -267,7 +264,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
if(WIN32 OR CYGWIN) if(WIN32 OR CYGWIN)
set(DEFINE_EXPORT "__declspec(dllexport)") set(DEFINE_EXPORT "__declspec(dllexport)")
set(DEFINE_IMPORT "__declspec(dllimport)") set(DEFINE_IMPORT "__declspec(dllimport)")
elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY) elseif(COMPILER_HAS_HIDDEN_VISIBILITY)
set(DEFINE_EXPORT "__attribute__((visibility(\"default\")))") set(DEFINE_EXPORT "__attribute__((visibility(\"default\")))")
set(DEFINE_IMPORT "__attribute__((visibility(\"default\")))") set(DEFINE_IMPORT "__attribute__((visibility(\"default\")))")
set(DEFINE_NO_EXPORT "__attribute__((visibility(\"hidden\")))") set(DEFINE_NO_EXPORT "__attribute__((visibility(\"hidden\")))")
...@@ -388,6 +385,9 @@ function(add_compiler_export_flags) ...@@ -388,6 +385,9 @@ function(add_compiler_export_flags)
_test_compiler_hidden_visibility() _test_compiler_hidden_visibility()
_test_compiler_has_deprecated() _test_compiler_has_deprecated()
option(USE_COMPILER_HIDDEN_VISIBILITY
"Use HIDDEN visibility support if available." ON)
mark_as_advanced(USE_COMPILER_HIDDEN_VISIBILITY)
if(NOT (USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY)) if(NOT (USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY))
# Just return if there are no flags to add. # Just return if there are no flags to add.
return() return()
......
...@@ -110,7 +110,7 @@ if (WIN32 OR CYGWIN) ...@@ -110,7 +110,7 @@ if (WIN32 OR CYGWIN)
else() else()
set(_platform WinEmpty) set(_platform WinEmpty)
endif() endif()
elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY) elseif(COMPILER_HAS_HIDDEN_VISIBILITY)
set(_platform UNIX) set(_platform UNIX)
elseif(COMPILER_HAS_DEPRECATED) elseif(COMPILER_HAS_DEPRECATED)
set(_platform UNIX_DeprecatedOnly) set(_platform UNIX_DeprecatedOnly)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment