nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix OpenSSL 1.1 detection for static builds

Browse Source
This commit is contained in:
hyc 2017-09-20 01:38:43 +01:00
parent 1a73843cec
commit 8b1acc9a86
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -319,6 +319,12 @@ else()
message(STATUS "Stack trace on exception disabled") message(STATUS "Stack trace on exception disabled")
endif() endif()
if (UNIX AND NOT APPLE)
# Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
endif()
# Handle OpenSSL, used for sha256sum on binary updates # Handle OpenSSL, used for sha256sum on binary updates
if (APPLE AND NOT IOS) if (APPLE AND NOT IOS)
if (NOT OpenSSL_DIR) if (NOT OpenSSL_DIR)
@ -332,16 +338,10 @@ endif()
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
if(STATIC AND NOT IOS) if(STATIC AND NOT IOS)
if(UNIX) if(UNIX)
set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS}") set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${CMAKE_DL_LIBS};${CMAKE_THREAD_LIBS_INIT}")
endif() endif()
endif() endif()
if (UNIX AND NOT APPLE)
# Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
endif()
add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP) add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP)
add_subdirectory(external) add_subdirectory(external)