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

various include fixes

Change-Id: Ic00be577eaf76395ec95b8f8a41c330006339f51
parent aa8c442f
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,13 @@ set (libdir "${CMAKE_INSTALL_FULL_LIBDIR}") ...@@ -11,7 +11,13 @@ set (libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
set (includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") set (includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
find_package (PkgConfig REQUIRED) 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) find_package(fmt)
pkg_check_modules (opendht REQUIRED IMPORTED_TARGET opendht>=2.6.0) pkg_check_modules (opendht REQUIRED IMPORTED_TARGET opendht>=2.6.0)
pkg_check_modules (pjproject REQUIRED IMPORTED_TARGET libpjproject) pkg_check_modules (pjproject REQUIRED IMPORTED_TARGET libpjproject)
...@@ -54,7 +60,7 @@ list (APPEND dhtnet_HEADERS ...@@ -54,7 +60,7 @@ list (APPEND dhtnet_HEADERS
) )
add_library(dhtnet ${dhtnet_SOURCES}) 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 target_include_directories(dhtnet PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#pragma once #pragma once
#include "ip_utils.h" #include "../ip_utils.h"
#include <map> #include <map>
#include <string> #include <string>
......
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
#endif #endif
#include "igd.h"*/ #include "igd.h"*/
#include "ip_utils.h" #include "../ip_utils.h"
#include "upnp_thread_util.h" #include "upnp_thread_util.h"
#include "upnp/mapping.h" #include "mapping.h"
#include <opendht/rng.h> #include <opendht/rng.h>
#include <opendht/logger.h> #include <opendht/logger.h>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#pragma once #pragma once
#include "mapping.h" #include "mapping.h"
#include "ip_utils.h" #include "../ip_utils.h"
#include <memory> #include <memory>
#include <chrono> #include <chrono>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment