diff options
| author | warptangent <warptangent@tutanota.com> | 2016-02-12 16:52:52 -0800 |
|---|---|---|
| committer | warptangent <warptangent@tutanota.com> | 2016-02-12 16:54:14 -0800 |
| commit | 9832d18dcaf664750758f5f0afb73097cfdfa9c8 (patch) | |
| tree | 49d32c8a41428b4ef1f8f1789c0fb17be9cb7e61 | |
| parent | cmake: Remove unused variable (diff) | |
| download | monero-9832d18dcaf664750758f5f0afb73097cfdfa9c8.tar.xz | |
cmake: Include OpenSSL libraries in static linking
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | external/unbound/CMakeLists.txt | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 05c747aec..3e95f48ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,8 +177,6 @@ if(MINGW) list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES ${DEFLIB}) endif() -set(ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - if(STATIC) if(MSVC) set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll.a .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 70763caf0..33e843e63 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -76,11 +76,12 @@ endif() find_package(Unbound) if(NOT UNBOUND_INCLUDE_DIR OR STATIC) - # We want unbound config tests to be independent of changes made to this setting. - set(CURRENT_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) + # NOTE: If STATIC is true, CMAKE_FIND_LIBRARY_SUFFIXES has been reordered. + # unbound has config tests which used OpenSSL libraries, so -ldl may need to + # be set in this case. + # The unbound CMakeLists.txt can set it, since it's also needed for the + # static OpenSSL libraries set up there after with target_link_libraries. add_subdirectory(unbound) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CURRENT_CMAKE_FIND_LIBRARY_SUFFIXES}) set(UNBOUND_STATIC true PARENT_SCOPE) set(UNBOUND_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/unbound/libunbound" PARENT_SCOPE) diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index 839b21c70..0dd5d6bc4 100644 --- a/external/unbound/CMakeLists.txt +++ b/external/unbound/CMakeLists.txt @@ -40,6 +40,12 @@ if (APPLE) endif() find_package(OpenSSL REQUIRED) +if(STATIC) + if(UNIX) + set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS}") + endif() +endif() + find_package(Threads) include(configure_checks.cmake) |