diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,6 +43,16 @@ add_compiler_flag(-Wno-unused-parameter) endif() +# Create a target for OpenSSL +include(BrewHelper) +find_brew_prefix(OPENSSL_ROOT_DIR openssl) +find_package(OpenSSL REQUIRED) + +add_library(OpenSSL STATIC IMPORTED) +set_target_properties(OpenSSL PROPERTIES + IMPORTED_LOCATION ${OPENSSL_CRYPTO_LIBRARY} + INTERFACE_INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR}) + # libtool style configure add_subdirectory(config) @@ -86,8 +96,6 @@ . # To access the config. ${CMAKE_CURRENT_BINARY_DIR} - PRIVATE - ${OPENSSL_INCLUDE_DIR} ) # Target specific configs diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -111,9 +111,6 @@ check_symbol_exists(daemon "unistd.h" HAVE_DECL_DAEMON) # OpenSSL functionality -include(BrewHelper) -find_brew_prefix(OPENSSL_ROOT_DIR openssl) -find_package(OpenSSL REQUIRED) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_CRYPTO_INCLUDES}) set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) check_symbol_exists(EVP_MD_CTX_new "openssl/evp.h" HAVE_DECL_EVP_MD_CTX_NEW) diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -32,7 +32,4 @@ endif() # Dependencies -include(BrewHelper) -find_brew_prefix(OPENSSL_ROOT_DIR openssl) -find_package(OpenSSL REQUIRED) -target_link_libraries(crypto ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(crypto OpenSSL) diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -114,8 +114,6 @@ ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/forms ${Protobuf_INCLUDE_DIRS} - PRIVATE - ${OPENSSL_INCLUDE_DIR} ) target_link_libraries(bitcoin-qt-base @@ -123,6 +121,7 @@ rpcclient Qt5::Widgets Qt5::Network + OpenSSL ${Protobuf_LIBRARIES} ) @@ -167,11 +166,4 @@ ) target_link_libraries(bitcoin-qt-base wallet) - - # Dependencies - # Support Brew OpenSSL on MacOS X - include(BrewHelper) - find_brew_prefix(OPENSSL_ROOT_DIR openssl) - find_package(OpenSSL REQUIRED) - target_link_libraries(bitcoin-qt-base ${OPENSSL_CRYPTO_LIBRARY}) endif() diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -133,8 +133,6 @@ PUBLIC # To access the generated json headers. ${CMAKE_CURRENT_BINARY_DIR} - PRIVATE - ${OPENSSL_INCLUDE_DIR} ) find_package(Boost 1.58 REQUIRED unit_test_framework)