From bcb29c3588dd2e42eeeda3660c057e04e90dde5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= Date: Wed, 23 Sep 2020 14:44:58 -0400 Subject: [PATCH] build/cmake: support new pkgconfig macros --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa4bfa90..657d92f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ if (NOT OPENDHT_ARGON2) if (argon2_FOUND) message("-- Found Argon2: " ${argon2_LIBRARY_DIRS} " (found version \"" ${argon2_VERSION} "\")") link_directories (${argon2_LIBRARY_DIRS}) + set (argon2_lib ", libargon2") else () message("Argon2 not found, using included version.") set(OPENDHT_ARGON2 ON) @@ -64,16 +65,16 @@ if (Jsoncpp_FOUND) src/base64.h src/base64.cpp ) + set (jsoncpp_lib ", jsoncpp") endif() if (OPENDHT_HTTP) find_package(Restinio REQUIRED) - if (Restinio_FOUND) - find_library(FMT_LIBRARY fmt) - add_library(fmt SHARED IMPORTED) - find_library(HTTP_PARSER_LIBRARY http_parser) - add_library(http_parser SHARED IMPORTED) - endif() + find_library(FMT_LIBRARY fmt) + add_library(fmt SHARED IMPORTED) + find_library(HTTP_PARSER_LIBRARY http_parser) + add_library(http_parser SHARED IMPORTED) + set (http_parser_lib "-lhttp-parser") if (NOT Jsoncpp_FOUND) message(SEND_ERROR "Jsoncpp is required for DHT proxy support") endif() @@ -83,6 +84,7 @@ if (OPENDHT_HTTP) if (OPENSSL_FOUND) message(STATUS "Found OpenSSL ${OPENSSL_VERSION}") include_directories(${OPENSSL_INCLUDE_DIRS}) + set(openssl_lib ", openssl") else () message(SEND_ERROR "OpenSSL is required for DHT proxy as specified") endif()