aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2014-10-06 19:17:40 +0200
committerRiccardo Spagni <ric@spagni.net>2014-10-06 19:17:40 +0200
commitf8fd03602c5dced6feba3bab56132a1d82fa1103 (patch)
treec24c3dc96619e93bc93691f668758780fd101841
parentadded bison/yacc static build dependency (diff)
downloadmonero-f8fd03602c5dced6feba3bab56132a1d82fa1103.tar.xz
turns out mingw does actually produce .a libs and not .dll.a
-rwxr-xr-xexternal/CMakeLists.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 1fad9bfe5..9f24761ce 100755
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -116,7 +116,6 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC)
LOG_TEST 1
LOG_INSTALL 1
)
- set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.dll.a;${OPENSSL_LIBRARIES}" PARENT_SCOPE)
ELSEIF(APPLE)
execute_process(COMMAND brew --prefix OUTPUT_VARIABLE BREW_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
EXTERNALPROJECT_ADD(
@@ -135,7 +134,6 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC)
LOG_TEST 1
LOG_INSTALL 1
)
- set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.a;${OPENSSL_LIBRARIES}" PARENT_SCOPE)
ELSE()
EXTERNALPROJECT_ADD(
libunbound
@@ -153,11 +151,11 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC)
LOG_TEST 1
LOG_INSTALL 1
)
- set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.a;${OPENSSL_LIBRARIES}" PARENT_SCOPE)
ENDIF()
set(UNBOUND_STATIC true PARENT_SCOPE)
set(UNBOUND_INCLUDE "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build" PARENT_SCOPE)
+ set(UNBOUND_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/unbound/src/libunbound-build/libunbound.a;${OPENSSL_LIBRARIES}" PARENT_SCOPE)
ELSE()
MESSAGE(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}")
IF(UNBOUND_LIBRARIES)