ci/github: cleanup

Revert "more attempts to find msgpackc-cxx in a universal way"
This reverts commit 965fbb43c7.
2026-11-08 12:28:42 +00:00 · 2023-03-25 18:27:19 -04:00 · 2023-03-25 18:26:47 -04:00
2 changed files with 3 additions and 8 deletions
@@ -4,7 +4,7 @@ on: [push, pull_request]

 jobs:
  build-ubuntu:
-    name: Ubuntu/GCC autotools build
+    name: Ubuntu/GCC Autotools build
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v3
@@ -59,10 +59,7 @@ if (NOT MSVC)
    find_package (PkgConfig REQUIRED)
    pkg_search_module (GnuTLS REQUIRED IMPORTED_TARGET gnutls)
    pkg_search_module (Nettle REQUIRED IMPORTED_TARGET nettle)
-    check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX)
-    if (NOT HAVE_MSGPACKCXX)
-        find_package (msgpack REQUIRED CONFIG)
-    endif()
+    find_package (msgpack REQUIRED NAMES msgpackc-cxx msgpack msgpack-cxx)
    if (OPENDHT_TOOLS)
        find_package (Readline 6 REQUIRED)
    endif ()
@@ -350,11 +347,9 @@ target_link_libraries(opendht
    PUBLIC
        ${CMAKE_THREAD_LIBS_INIT}
        PkgConfig::GnuTLS
+        msgpackc-cxx
        ${FMT_LIBRARY}
 )
-if (NOT HAVE_MSGPACKCXX)
-    target_link_libraries(opendht PUBLIC msgpackc-cxx)
-endif()
 if (Jsoncpp_FOUND)
    target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp)
 endif()
Author	SHA1	Message	Date
Adrien Beraud	95f3920ca8	ci/github: cleanup	2023-03-25 18:27:19 -04:00
Adrien Beraud	5f1e7952a4	Revert "more attempts to find msgpackc-cxx in a universal way" This reverts commit `965fbb43c7`.	2023-03-25 18:26:47 -04:00