diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-10-05 20:57:52 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-10-05 20:57:52 +0100 |
| commit | 5d0cb73356481e66e05911fb2c2ff85230b7d6c3 (patch) | |
| tree | 1fe35c1082ccf4287407b1eecc60a0f0da8c5ca4 | |
| parent | Merge pull request #410 (diff) | |
| download | monero-5d0cb73356481e66e05911fb2c2ff85230b7d6c3.tar.xz | |
unbound: do not try to link against libevent
It is now not needed anymore, as we use minievent instead
| -rw-r--r-- | external/unbound/CMakeLists.txt | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index 72e2addd6..47010e1b3 100644 --- a/external/unbound/CMakeLists.txt +++ b/external/unbound/CMakeLists.txt @@ -40,7 +40,7 @@ if (WIN32) set(USE_WINSOCK 1) else () find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBEVENT2 REQUIRED libevent) + set(USE_MINI_EVENT 1) endif () set(RETSIGTYPE void) @@ -181,10 +181,6 @@ set(libunbound_src include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories("${CMAKE_CURRENT_BINARY_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 ${common_src} ${sldns_src} @@ -194,11 +190,6 @@ target_link_libraries(unbound LINK_PRIVATE ${OPENSSL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -if (LIBEVENT2_FOUND) - target_link_libraries(unbound - LINK_PRIVATE - ${LIBEVENT2_LIBRARIES}) -endif () if (WIN32) target_link_libraries(unbound @@ -207,11 +198,6 @@ if (WIN32) ws2_32) endif () -# XXX: Hack for static builds. -set(LIBEVENT2_LIBDIR - "${LIBEVENT2_LIBDIR}" - PARENT_SCOPE) - if (MINGW) # There is no variable for this (probably due to the fact that the pthread # library is implicit with a link in msys). |