commit c385551b08db242c60ab01ec77ff327eba2b1879
author François-Simon Fauteux-Chapleau <francois-simon.fauteux-chapleau@savoirfairelinux.com> Mon Apr 29 11:39:04 2024 -0400
committer François-Simon Fauteux-Chapleau <francois-simon.fauteux-chapleau@savoirfairelinux.com> Tue Apr 30 14:46:54 2024 -0400
tree 1020bc36f2e9077b5faa44551c2d62d41b8a16c7
parent d7976982d24867c6faaf8103504ec8a10d932fa0

dependencies: add msgpack

DHTNet currently doesn't compile on some platforms (including Debian 12,
Ubuntu 23.10 and openSUSE Leap 15.5) because the version of msgpack
available via their package manager doesn't support (un)packing data of
type std::chrono::time_point.

Change-Id: I3166edf3992325bb7ce88030b5cc09f31cba4ead

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e71ca35..deda8b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,12 +40,30 @@
 endif()
 
 if (NOT MSVC)
+    # Check if there's a recent enough version of msgpack installed on the system
+    find_package(msgpack 5.0.0 QUIET CONFIG NAMES msgpack msgpackc-cxx)
+    if (msgpack_FOUND)
+        set(MSGPACK_TARGET "msgpackc-cxx")
+    else()
+        find_package(msgpack 5.0.0 QUIET CONFIG NAMES msgpack-cxx)
+        if (msgpack_FOUND)
+            set(MSGPACK_TARGET "msgpack-cxx")
+        endif()
+    endif()
+    # If no suitable version of msgpack was found, build the one
+    # included as a submodule in the dependencies folder
+    if (NOT msgpack_FOUND)
+        set(DEPENDENCIES_BUILD_ARGS "--build-msgpack")
+    else()
+        set(DEPENDENCIES_BUILD_ARGS "")
+    endif()
+
     set(DEPENDENCIES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/install/${TARGET})
     message("dependencies path: ${DEPENDENCIES_PATH}")
     if (BUILD_DEPENDENCIES)
         find_package(Python3 COMPONENTS Interpreter)
         execute_process(
-            COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/build.py
+            COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/build.py ${DEPENDENCIES_BUILD_ARGS}
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies
             RESULT_VARIABLE BUILD_RESULT
         )
@@ -62,17 +80,6 @@
         list(APPEND PKG_CONFIG_EXECUTABLE "--static")
     endif()
 
-    check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX)
-    if (NOT HAVE_MSGPACKCXX)
-        find_package(msgpack QUIET CONFIG NAMES msgpack msgpackc-cxx)
-        if (NOT msgpack_FOUND)
-            find_package(msgpack REQUIRED CONFIG NAMES msgpack-cxx)
-            set(MSGPACK_TARGET "msgpack-cxx")
-        else()
-            set(MSGPACK_TARGET "msgpackc-cxx")
-        endif()
-    endif()
-
     if (BUILD_TOOLS)
         find_package(yaml-cpp REQUIRED)
     endif()
@@ -241,7 +248,7 @@
         ${WIN32_DEP_DIR}/../msvc/lib/libfmt.lib
         ${WIN32_DEP_DIR}/../msvc/lib/libmsgpackc-cxx.lib)
 endif()
-if (NOT HAVE_MSGPACKCXX)
+if (msgpack_FOUND)
     target_link_libraries(dhtnet PUBLIC ${MSGPACK_TARGET})
 endif()
 if (APPLE)