various include fixes
Change-Id: Ic00be577eaf76395ec95b8f8a41c330006339f51
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47740a5..ec0da0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,13 @@
set (includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
find_package (PkgConfig REQUIRED)
-find_package(msgpack REQUIRED QUIET CONFIG NAMES msgpack msgpack-cxx)
+find_package(msgpackc-cxx QUIET CONFIG)
+if(msgpackc-cxx_FOUND)
+ add_library(msgpack-cxx ALIAS msgpackc-cxx)
+else()
+ find_package(msgpack-cxx CONFIG REQUIRED)
+endif()
+
find_package(fmt)
pkg_check_modules (opendht REQUIRED IMPORTED_TARGET opendht>=2.6.0)
pkg_check_modules (pjproject REQUIRED IMPORTED_TARGET libpjproject)
@@ -54,7 +60,7 @@
)
add_library(dhtnet ${dhtnet_SOURCES})
-target_link_libraries(dhtnet PUBLIC PkgConfig::opendht PkgConfig::pjproject fmt::fmt msgpackc)
+target_link_libraries(dhtnet PUBLIC PkgConfig::opendht PkgConfig::pjproject fmt::fmt msgpack-cxx)
target_include_directories(dhtnet PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>