Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

include openssl in linbunbound static linking, added errors for openssl and expat

Browse Source
This commit is contained in:
Riccardo Spagni 2014-10-06 18:06:25 +02:00
parent 6ef8ae8bd8
commit 1d5991ed33
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
external/CMakeLists.txt vendored
View File

@ -86,7 +86,18 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC)
INCLUDE(ExternalProject) INCLUDE(ExternalProject)
FIND_PACKAGE(OpenSSL REQUIRED) FIND_PACKAGE(OpenSSL REQUIRED)
IF(!OPENSSL_LIBRARIES)
MESSAGE(FATAL_ERROR "${BoldRed}Could not find the openssl library. Please make sure you have installed openssl or libssl-dev or the equivalent${ColourReset}")
ELSE()
MESSAGE(STATUS "Found openssl libraries")
ENDIF()
FIND_PACKAGE(Expat REQUIRED) FIND_PACKAGE(Expat REQUIRED)
IF(!EXPAT_LIBRARIES)
MESSAGE(FATAL_ERROR "${BoldRed}Could not find the expat library. Please make sure you have installed libexpat or libexpat-dev or the equivalent${ColourReset}")
ELSE()
MESSAGE(STATUS "Found expat libraries")
ENDIF()
IF(MINGW) IF(MINGW)
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
@ -105,7 +116,7 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC)
LOG_TEST 1 LOG_TEST 1
LOG_INSTALL 1 LOG_INSTALL 1
) )
set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.dll.a" PARENT_SCOPE) set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.dll.a;${OPENSSL_LIBRARIES}" PARENT_SCOPE)
ELSEIF(APPLE) ELSEIF(APPLE)
execute_process(COMMAND brew --prefix OUTPUT_VARIABLE BREW_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND brew --prefix OUTPUT_VARIABLE BREW_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
@ -124,7 +135,7 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC)
LOG_TEST 1 LOG_TEST 1
LOG_INSTALL 1 LOG_INSTALL 1
) )
set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.a" PARENT_SCOPE) set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.a;${OPENSSL_LIBRARIES}" PARENT_SCOPE)
ELSE() ELSE()
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
libunbound libunbound
@ -142,7 +153,7 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC)
LOG_TEST 1 LOG_TEST 1
LOG_INSTALL 1 LOG_INSTALL 1
) )
set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.a" PARENT_SCOPE) set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.a;${OPENSSL_LIBRARIES}" PARENT_SCOPE)
ENDIF() ENDIF()
set(UNBOUND_STATIC true PARENT_SCOPE) set(UNBOUND_STATIC true PARENT_SCOPE)