diff options
author | Naios <naios-dev@live.de> | 2017-10-31 01:29:51 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2017-12-20 04:04:27 +0100 |
commit | ff35262a3ac804db7a941f29040e4b299a7cb7c4 (patch) | |
tree | fe05ea8b57ab71056a6e800a00213fbab8a066c7 /dep/protobuf/CMakeLists.txt | |
parent | af7352118b6e7306a8d8a28934ee62f27886808e (diff) |
Build: Use interface targets for inheriting flags and definitions
* Remove the usage of global flags and definitions
set through the CMAKE_CXX_FLAGS variable.
* Use cmake target compile features for setting the
CXX standard automatically.
* Make C++14 globally available in the project
* Closes #21033
(cherry picked from commit e60c1f84a7e13577a82046b02b214f9466d20a7c)
Diffstat (limited to 'dep/protobuf/CMakeLists.txt')
-rw-r--r-- | dep/protobuf/CMakeLists.txt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/dep/protobuf/CMakeLists.txt b/dep/protobuf/CMakeLists.txt index c6aad4bf631..c4b5d83f45e 100644 --- a/dep/protobuf/CMakeLists.txt +++ b/dep/protobuf/CMakeLists.txt @@ -57,13 +57,6 @@ else() ) endif() -if (UNIX) - # Enable the default unix export behaviour for protobuf so we don't - # need to patch it's sources. - string(REPLACE "-fvisibility=hidden" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") - string(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -endif() - add_library(protobuf ${protobuf_STAT_SRCS}) target_include_directories(protobuf @@ -73,6 +66,8 @@ target_include_directories(protobuf ${CMAKE_CURRENT_SOURCE_DIR}/tc_custom) target_link_libraries(protobuf + PRIVATE + trinity-default-interface PUBLIC threads) |