Merge remote-tracking branch 'origin/develop' into upstream_secp256k1

EOSIO · Jan 7, 2021 · 7c98ac7 · 7c98ac7
2 parents 2afbb26 + 8b2d0ed
commit 7c98ac7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,8 +49,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}
 endif()
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-  set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+  set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 endif()
 
 if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")

diff --git a/plugins/blockvault_client_plugin/CMakeLists.txt b/plugins/blockvault_client_plugin/CMakeLists.txt
@@ -1,8 +1,5 @@
 find_package(PkgConfig REQUIRED)
 
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-
 add_library( blockvault_client_plugin
              blockvault_client_plugin.cpp)
 target_link_libraries( blockvault_client_plugin appbase eosio_chain)

diff --git a/plugins/blockvault_client_plugin/tests/CMakeLists.txt b/plugins/blockvault_client_plugin/tests/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-
 add_executable(blockvault_unittests main.cpp  postgres_backend_tests.cpp compressor_test.cpp)
 target_link_libraries(blockvault_unittests blockvault Boost::unit_test_framework)
 

diff --git a/plugins/resource_monitor_plugin/test/CMakeLists.txt b/plugins/resource_monitor_plugin/test/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-
 add_executable( test_threshold test_threshold.cpp )
 target_link_libraries( test_threshold resource_monitor_plugin )
 target_include_directories( test_threshold PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )