diff options
Diffstat (limited to 'ctrl')
| -rw-r--r-- | ctrl/facemgr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/facemgr/src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/hicn_plugin_api.c | 10 |
4 files changed, 15 insertions, 5 deletions
diff --git a/ctrl/facemgr/CMakeLists.txt b/ctrl/facemgr/CMakeLists.txt index 8b24810fb..290f96fa0 100644 --- a/ctrl/facemgr/CMakeLists.txt +++ b/ctrl/facemgr/CMakeLists.txt @@ -58,7 +58,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) -find_package_wrapper(Config REQUIRED) +find_package_wrapper(Libconfig REQUIRED) find_package_wrapper(LibEvent REQUIRED) set(FACEMGR facemgr CACHE INTERNAL "" FORCE) diff --git a/ctrl/facemgr/src/CMakeLists.txt b/ctrl/facemgr/src/CMakeLists.txt index 4bcad475d..3650ef4f5 100644 --- a/ctrl/facemgr/src/CMakeLists.txt +++ b/ctrl/facemgr/src/CMakeLists.txt @@ -64,7 +64,7 @@ set(LIBRARIES m ${HICN_LIBRARIES} ${LIBHICNCTRL_LIBRARIES} - ${CONFIG_LIBRARY} + ${LIBCONFIG_LIBRARIES} ${LIBEVENT_LIBRARY} ) @@ -106,7 +106,7 @@ if (DISABLE_SHARED_LIBRARIES) LINK_LIBRARIES ${LIBRARIES} COMPONENT ${FACEMGR} INCLUDE_DIRS ${INCLUDE_DIRS} - INSTALL_ROOT_DIR hicn + HEADER_ROOT_DIR hicn DEFINITIONS ${COMPILER_DEFINITIONS} ) else () @@ -118,7 +118,7 @@ else () LINK_LIBRARIES ${LIBRARIES} COMPONENT ${FACEMGR} INCLUDE_DIRS ${INCLUDE_DIRS} - INSTALL_ROOT_DIR hicn + HEADER_ROOT_DIR hicn DEFINITIONS ${COMPILER_DEFINITIONS} ) endif () diff --git a/ctrl/libhicnctrl/src/CMakeLists.txt b/ctrl/libhicnctrl/src/CMakeLists.txt index 00661a2a0..f5d3c49a3 100644 --- a/ctrl/libhicnctrl/src/CMakeLists.txt +++ b/ctrl/libhicnctrl/src/CMakeLists.txt @@ -69,7 +69,7 @@ build_library(${LIBHICNCTRL} DEPENDS ${DEPENDENCIES} COMPONENT ${LIBHICNCTRL_COMPONENT} INCLUDE_DIRS ${INCLUDE_DIRS} - INSTALL_ROOT_DIR hicn + HEADER_ROOT_DIR hicn DEFINITIONS ${COMPILER_DEFINITIONS} ) diff --git a/ctrl/libhicnctrl/src/hicn_plugin_api.c b/ctrl/libhicnctrl/src/hicn_plugin_api.c index 0b0a9ad54..231c491ba 100644 --- a/ctrl/libhicnctrl/src/hicn_plugin_api.c +++ b/ctrl/libhicnctrl/src/hicn_plugin_api.c @@ -40,8 +40,18 @@ #include <hicn/util/map.h> #include <hicn/error.h> #include <vnet/ip/ip6_packet.h> + + +#if __GNUC__ >= 9 +#pragma GCC diagnostic ignored "-Waddress-of-packed-member" +#endif + #include <vnet/ip/ip46_address.h> +#if __GNUC__ >= 9 +#pragma GCC diagnostic pop +#endif + #define APP_NAME "hicn_plugin" #define MAX_OUTSTANDING_REQUESTS 4 #define RESPONSE_QUEUE_SIZE 2 |