diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-09-18 11:44:08 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-09-18 11:44:08 +0200 |
commit | 4a03a8a1da1341fcceeb8a73a24ea1b4cedb443c (patch) | |
tree | ae9b02dcb8c241b719e0f8ea7c4ef3fe991b9f3a /external | |
parent | Merge pull request #1093 (diff) | |
parent | cmake: support BUILD_SHARED_LIBS built-in option (diff) | |
download | monero-4a03a8a1da1341fcceeb8a73a24ea1b4cedb443c.tar.xz |
Merge pull request #1094
06bb692 cmake: support BUILD_SHARED_LIBS built-in option (redfish)
e1c7af3 cmake: transitive deps and remove deprecated LINK_* (redfish)
54010b9 crypto: armv7: slow-hash: remove redundant source include (redfish)
Diffstat (limited to 'external')
-rw-r--r-- | external/db_drivers/liblmdb/CMakeLists.txt | 2 | ||||
-rw-r--r-- | external/unbound/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/external/db_drivers/liblmdb/CMakeLists.txt b/external/db_drivers/liblmdb/CMakeLists.txt index ec435d1c8..00b203e94 100644 --- a/external/db_drivers/liblmdb/CMakeLists.txt +++ b/external/db_drivers/liblmdb/CMakeLists.txt @@ -39,7 +39,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}") add_library(lmdb ${lmdb_sources}) target_link_libraries(lmdb - LINK_PRIVATE + PRIVATE ${CMAKE_THREAD_LIBS_INIT}) if(WIN32) target_link_libraries(lmdb diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index 4b82fab82..c1e2d6887 100644 --- a/external/unbound/CMakeLists.txt +++ b/external/unbound/CMakeLists.txt @@ -202,13 +202,13 @@ add_library(unbound ${compat_src} ${libunbound_src}) target_link_libraries(unbound - LINK_PRIVATE + PRIVATE ${OPENSSL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) if (WIN32) target_link_libraries(unbound - LINK_PRIVATE + PRIVATE iphlpapi ws2_32) endif () |