monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

unbound: do not try to link against libevent

Browse source 
It is now not needed anymore, as we use minievent instead
This commit is contained in:
moneromooo-monero 2015-10-05 20:57:52 +01:00
parent 1e7fc9c093
commit 5d0cb73356
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
external/unbound/CMakeLists.txt vendored
View file

@ -40,7 +40,7 @@ if (WIN32)
set(USE_WINSOCK 1) set(USE_WINSOCK 1)
else () else ()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBEVENT2 REQUIRED libevent) set(USE_MINI_EVENT 1)
endif () endif ()
set(RETSIGTYPE void) set(RETSIGTYPE void)
@ -181,10 +181,6 @@ set(libunbound_src
include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
include_directories("${CMAKE_CURRENT_BINARY_DIR}") include_directories("${CMAKE_CURRENT_BINARY_DIR}")
include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
if (LIBEVENT2_FOUND)
include_directories(SYSTEM ${LIBEVENT2_INCLUDE_DIRS})
link_directories(${LIBEVENT2_LIBRARY_DIRS})
endif ()
add_library(unbound add_library(unbound
${common_src} ${common_src}
${sldns_src} ${sldns_src}
@ -194,11 +190,6 @@ target_link_libraries(unbound
LINK_PRIVATE LINK_PRIVATE
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}) ${CMAKE_THREAD_LIBS_INIT})
if (LIBEVENT2_FOUND)
target_link_libraries(unbound
LINK_PRIVATE
${LIBEVENT2_LIBRARIES})
endif ()
if (WIN32) if (WIN32)
target_link_libraries(unbound target_link_libraries(unbound
@ -207,11 +198,6 @@ if (WIN32)
ws2_32) ws2_32)
endif () endif ()
# XXX: Hack for static builds.
set(LIBEVENT2_LIBDIR
"${LIBEVENT2_LIBDIR}"
PARENT_SCOPE)
if (MINGW) if (MINGW)
# There is no variable for this (probably due to the fact that the pthread # There is no variable for this (probably due to the fact that the pthread
# library is implicit with a link in msys). # library is implicit with a link in msys).