Merge pull request #656

9832d18 cmake: Include OpenSSL libraries in static linking (warptangent)
c2f2437 cmake: Remove unused variable (warptangent)
7205210 cmake: Fix unbound config compile settings (warptangent)
3e72d97 cmake: Fix overly broad use of dynamic link settings (warptangent)
This commit is contained in:
Riccardo Spagni 2016-02-13 19:51:56 +02:00
commit 354d478286
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
4 changed files with 12 additions and 10 deletions

View File

@ -437,7 +437,7 @@ elseif(APPLE OR FREEBSD OR OPENBSD)
set(EXTRA_LIBRARIES "") set(EXTRA_LIBRARIES "")
elseif(NOT MSVC) elseif(NOT MSVC)
find_library(RT rt) find_library(RT rt)
set(EXTRA_LIBRARIES ${RT} ${DL}) set(EXTRA_LIBRARIES ${RT})
endif() endif()
include(version.cmake) include(version.cmake)

View File

@ -76,6 +76,11 @@ endif()
find_package(Unbound) find_package(Unbound)
if(NOT UNBOUND_INCLUDE_DIR OR STATIC) if(NOT UNBOUND_INCLUDE_DIR OR STATIC)
# 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) add_subdirectory(unbound)
set(UNBOUND_STATIC true PARENT_SCOPE) set(UNBOUND_STATIC true PARENT_SCOPE)

View File

@ -40,6 +40,12 @@ if (APPLE)
endif() endif()
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
if(STATIC)
if(UNIX)
set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS}")
endif()
endif()
find_package(Threads) find_package(Threads)
include(configure_checks.cmake) include(configure_checks.cmake)

View File

@ -63,15 +63,6 @@ function (bitmonero_add_executable name)
set_property(TARGET "${name}" set_property(TARGET "${name}"
PROPERTY PROPERTY
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
if (STATIC)
set_property(TARGET "${name}"
PROPERTY
LINK_SEARCH_START_STATIC 1)
set_property(TARGET "${name}"
PROPERTY
LINK_SEARCH_END_STATIC 1)
endif ()
endfunction () endfunction ()
function (bitmonero_add_library name) function (bitmonero_add_library name)