Skip to content
Snippets Groups Projects
Commit 5f1e7952 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

Revert "more attempts to find msgpackc-cxx in a universal way"

This reverts commit 965fbb43.
parent 41eabc72
Branches
No related tags found
No related merge requests found
...@@ -59,10 +59,7 @@ if (NOT MSVC) ...@@ -59,10 +59,7 @@ if (NOT MSVC)
find_package (PkgConfig REQUIRED) find_package (PkgConfig REQUIRED)
pkg_search_module (GnuTLS REQUIRED IMPORTED_TARGET gnutls) pkg_search_module (GnuTLS REQUIRED IMPORTED_TARGET gnutls)
pkg_search_module (Nettle REQUIRED IMPORTED_TARGET nettle) pkg_search_module (Nettle REQUIRED IMPORTED_TARGET nettle)
check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX) find_package (msgpack REQUIRED NAMES msgpackc-cxx msgpack msgpack-cxx)
if (NOT HAVE_MSGPACKCXX)
find_package (msgpack REQUIRED CONFIG)
endif()
if (OPENDHT_TOOLS) if (OPENDHT_TOOLS)
find_package (Readline 6 REQUIRED) find_package (Readline 6 REQUIRED)
endif () endif ()
...@@ -350,11 +347,9 @@ target_link_libraries(opendht ...@@ -350,11 +347,9 @@ target_link_libraries(opendht
PUBLIC PUBLIC
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
PkgConfig::GnuTLS PkgConfig::GnuTLS
msgpackc-cxx
${FMT_LIBRARY} ${FMT_LIBRARY}
) )
if (NOT HAVE_MSGPACKCXX)
target_link_libraries(opendht PUBLIC msgpackc-cxx)
endif()
if (Jsoncpp_FOUND) if (Jsoncpp_FOUND)
target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp) target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp)
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment