proper CMake finding and using of libunbound

pull/1307/head
Thomas Winget 4 years ago
parent c2a30692cf
commit df284cb757

@ -226,8 +226,12 @@ endif()
string(REGEX REPLACE "^fatal.*$" nogit GIT_VERSION_REAL "${GIT_VERSION}") string(REGEX REPLACE "^fatal.*$" nogit GIT_VERSION_REAL "${GIT_VERSION}")
find_package(PkgConfig QUIET) find_package(PkgConfig REQUIRED)
if(PKG_CONFIG_FOUND)
pkg_check_modules(UNBOUND libunbound REQUIRED IMPORTED_TARGET)
add_library(libunbound INTERFACE)
pkg_check_modules(SD libsystemd) pkg_check_modules(SD libsystemd)
# Default WITH_SYSTEMD to true if we found it # Default WITH_SYSTEMD to true if we found it
option(WITH_SYSTEMD "enable systemd integration for sd_notify" ${SD_FOUND}) option(WITH_SYSTEMD "enable systemd integration for sd_notify" ${SD_FOUND})
@ -240,7 +244,6 @@ if(PKG_CONFIG_FOUND)
include_directories(${SD_INCLUDE_DIRS}) include_directories(${SD_INCLUDE_DIRS})
set(SD_LIBS ${SD_LDFLAGS}) set(SD_LIBS ${SD_LDFLAGS})
endif() endif()
endif()
option(SUBMODULE_CHECK "Enables checking that vendored library submodules are up to date" ON) option(SUBMODULE_CHECK "Enables checking that vendored library submodules are up to date" ON)
if(SUBMODULE_CHECK) if(SUBMODULE_CHECK)

@ -221,7 +221,9 @@ if(WITH_HIVE)
target_sources(liblokinet PRIVATE tooling/router_hive.cpp) target_sources(liblokinet PRIVATE tooling/router_hive.cpp)
endif() endif()
target_link_libraries(liblokinet PUBLIC cxxopts unbound abyss lokinet-platform lokinet-util lokinet-cryptography) target_link_libraries(liblokinet PUBLIC cxxopts abyss lokinet-platform lokinet-util lokinet-cryptography)
target_link_libraries(liblokinet PRIVATE PkgConfig::UNBOUND)
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
install(TARGETS lokinet-util lokinet-platform liblokinet LIBRARY DESTINATION lib) install(TARGETS lokinet-util lokinet-platform liblokinet LIBRARY DESTINATION lib)

Loading…
Cancel
Save