From 2966776df4c59e95bef62dd2ed871bf1529c6518 Mon Sep 17 00:00:00 2001 From: Antonio Prcela Date: Fri, 22 Sep 2023 15:24:53 +0200 Subject: [PATCH] build(cmake): fix build of plugins --- src/bridging/plugin/data/bridge/bridge.h | 2 +- src/bridging/plugin/data/bridge/list.c | 2 +- src/bridging/plugin/data/component/list.c | 2 +- src/bridging/plugin/data/vlan/list.c | 2 +- src/bridging/plugin/subscription/change.c | 2 +- src/interfaces/CMakeLists.txt | 1 + src/interfaces/src/plugin/api/interfaces/check.c | 2 +- src/interfaces/src/plugin/api/interfaces/load.c | 2 +- src/interfaces/src/plugin/api/interfaces/store.c | 2 +- .../src/plugin/data/interfaces/interface.c | 2 +- .../data/interfaces/interface/ipv4/address.c | 2 +- .../data/interfaces/interface/ipv4/neighbor.c | 2 +- .../data/interfaces/interface/ipv6/address.c | 2 +- .../data/interfaces/interface/ipv6/neighbor.c | 2 +- .../src/plugin/data/interfaces/interface_state.c | 2 +- src/interfaces/src/plugin/running/load.c | 4 ++-- src/interfaces/src/plugin/startup/load.c | 4 ++-- src/routing/CMakeLists.txt | 14 +++++++++----- src/routing/control_plane_protocol.c | 2 +- src/routing/rib.c | 2 +- src/routing/rib/list.c | 2 +- src/routing/route.c | 2 +- src/routing/route/list_hash.c | 2 +- src/routing/route/next_hop.c | 2 +- src/routing/routing.c | 2 +- 25 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/bridging/plugin/data/bridge/bridge.h b/src/bridging/plugin/data/bridge/bridge.h index fb9af585..2a8c30c5 100644 --- a/src/bridging/plugin/data/bridge/bridge.h +++ b/src/bridging/plugin/data/bridge/bridge.h @@ -10,7 +10,7 @@ #include // uthash -#include +#include "utlist.h" void bridge_init(bridge_t* br); void bridge_free(bridge_t* br); diff --git a/src/bridging/plugin/data/bridge/list.c b/src/bridging/plugin/data/bridge/list.c index f3911ed7..47082024 100644 --- a/src/bridging/plugin/data/bridge/list.c +++ b/src/bridging/plugin/data/bridge/list.c @@ -2,7 +2,7 @@ #include "memory.h" #include "plugin/data/bridge/bridge.h" -#include +#include "utlist.h" void bridge_list_init(bridge_list_element_t** head) { diff --git a/src/bridging/plugin/data/component/list.c b/src/bridging/plugin/data/component/list.c index 7b7ff792..e972d994 100644 --- a/src/bridging/plugin/data/component/list.c +++ b/src/bridging/plugin/data/component/list.c @@ -4,7 +4,7 @@ #include -#include +#include "utlist.h" void bridge_component_list_init(bridge_component_list_element_t** head) { diff --git a/src/bridging/plugin/data/vlan/list.c b/src/bridging/plugin/data/vlan/list.c index c2d1113c..0d7ca1da 100644 --- a/src/bridging/plugin/data/vlan/list.c +++ b/src/bridging/plugin/data/vlan/list.c @@ -3,7 +3,7 @@ #include #include -#include +#include "utlist.h" #include "list.h" #include "memory.h" diff --git a/src/bridging/plugin/subscription/change.c b/src/bridging/plugin/subscription/change.c index 7ba2a165..b3c03332 100644 --- a/src/bridging/plugin/subscription/change.c +++ b/src/bridging/plugin/subscription/change.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include "utlist.h" #include "change.h" #include "plugin/common.h" diff --git a/src/interfaces/CMakeLists.txt b/src/interfaces/CMakeLists.txt index daf31e74..27cc27dd 100644 --- a/src/interfaces/CMakeLists.txt +++ b/src/interfaces/CMakeLists.txt @@ -19,6 +19,7 @@ set(PLUGIN_EXECUTABLE_NAME "ietf-interfaces-plugin") include_directories( ${CMAKE_SOURCE_DIR}/src/interfaces/src + ${CMAKE_SOURCE_DIR}/src/utils ${CMAKE_SOURCE_DIR}/deps/uthash ) diff --git a/src/interfaces/src/plugin/api/interfaces/check.c b/src/interfaces/src/plugin/api/interfaces/check.c index 8861b36a..c5d4c872 100644 --- a/src/interfaces/src/plugin/api/interfaces/check.c +++ b/src/interfaces/src/plugin/api/interfaces/check.c @@ -13,7 +13,7 @@ #include "check.h" #include "plugin/api/interfaces/load.h" #include "plugin/common.h" -#include "src/uthash.h" +#include "uthash.h" #include "srpc/types.h" #include "sysrepo.h" diff --git a/src/interfaces/src/plugin/api/interfaces/load.c b/src/interfaces/src/plugin/api/interfaces/load.c index 05ac1ac9..a06150c2 100644 --- a/src/interfaces/src/plugin/api/interfaces/load.c +++ b/src/interfaces/src/plugin/api/interfaces/load.c @@ -18,7 +18,7 @@ #include "plugin/data/interfaces/interface.h" #include "plugin/types.h" #include "read.h" -#include "utils/memory.h" +#include "memory.h" #include "utlist.h" // load APIs diff --git a/src/interfaces/src/plugin/api/interfaces/store.c b/src/interfaces/src/plugin/api/interfaces/store.c index 7a68cb98..2cfafb08 100644 --- a/src/interfaces/src/plugin/api/interfaces/store.c +++ b/src/interfaces/src/plugin/api/interfaces/store.c @@ -23,7 +23,7 @@ #include "plugin/context.h" #include "plugin/data/interfaces/interface/ipv4/address.h" #include "plugin/types.h" -#include "src/utlist.h" +#include "utlist.h" #include "srpc/common.h" #include "sysrepo/xpath.h" #include "uthash.h" diff --git a/src/interfaces/src/plugin/data/interfaces/interface.c b/src/interfaces/src/plugin/data/interfaces/interface.c index 1ed94f33..b8d2abc3 100644 --- a/src/interfaces/src/plugin/data/interfaces/interface.c +++ b/src/interfaces/src/plugin/data/interfaces/interface.c @@ -20,7 +20,7 @@ #include "srpc/ly_tree.h" #include "sysrepo.h" #include "uthash.h" -#include "utils/memory.h" +#include "memory.h" #include "utlist.h" // other data API diff --git a/src/interfaces/src/plugin/data/interfaces/interface/ipv4/address.c b/src/interfaces/src/plugin/data/interfaces/interface/ipv4/address.c index 136d7083..9b0100f7 100644 --- a/src/interfaces/src/plugin/data/interfaces/interface/ipv4/address.c +++ b/src/interfaces/src/plugin/data/interfaces/interface/ipv4/address.c @@ -12,7 +12,7 @@ */ #include "address.h" #include "plugin/types.h" -#include "src/utlist.h" +#include "utlist.h" #include "srpc/common.h" #include diff --git a/src/interfaces/src/plugin/data/interfaces/interface/ipv4/neighbor.c b/src/interfaces/src/plugin/data/interfaces/interface/ipv4/neighbor.c index dca5306b..34008673 100644 --- a/src/interfaces/src/plugin/data/interfaces/interface/ipv4/neighbor.c +++ b/src/interfaces/src/plugin/data/interfaces/interface/ipv4/neighbor.c @@ -11,7 +11,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include "neighbor.h" -#include "src/utlist.h" +#include "utlist.h" interfaces_interface_ipv4_neighbor_element_t* interfaces_interface_ipv4_neighbor_new(void) { diff --git a/src/interfaces/src/plugin/data/interfaces/interface/ipv6/address.c b/src/interfaces/src/plugin/data/interfaces/interface/ipv6/address.c index 5140af26..c457689d 100644 --- a/src/interfaces/src/plugin/data/interfaces/interface/ipv6/address.c +++ b/src/interfaces/src/plugin/data/interfaces/interface/ipv6/address.c @@ -12,7 +12,7 @@ */ #include "address.h" #include "plugin/types.h" -#include "src/utlist.h" +#include "utlist.h" #include interfaces_interface_ipv6_address_element_t* interfaces_interface_ipv6_address_new(void) diff --git a/src/interfaces/src/plugin/data/interfaces/interface/ipv6/neighbor.c b/src/interfaces/src/plugin/data/interfaces/interface/ipv6/neighbor.c index eb1de8b7..652d7c59 100644 --- a/src/interfaces/src/plugin/data/interfaces/interface/ipv6/neighbor.c +++ b/src/interfaces/src/plugin/data/interfaces/interface/ipv6/neighbor.c @@ -11,7 +11,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include "neighbor.h" -#include "src/utlist.h" +#include "utlist.h" interfaces_interface_ipv6_neighbor_element_t* interfaces_interface_ipv6_neighbor_new(void) { diff --git a/src/interfaces/src/plugin/data/interfaces/interface_state.c b/src/interfaces/src/plugin/data/interfaces/interface_state.c index e9f4c9bb..5d63ff8f 100644 --- a/src/interfaces/src/plugin/data/interfaces/interface_state.c +++ b/src/interfaces/src/plugin/data/interfaces/interface_state.c @@ -11,7 +11,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include "interface_state.h" -#include "src/uthash.h" +#include "uthash.h" #include interfaces_interface_state_hash_element_t* interfaces_interface_state_hash_new(void) diff --git a/src/interfaces/src/plugin/running/load.c b/src/interfaces/src/plugin/running/load.c index 4f4a8692..85dd4fd7 100644 --- a/src/interfaces/src/plugin/running/load.c +++ b/src/interfaces/src/plugin/running/load.c @@ -18,8 +18,8 @@ #include "plugin/api/interfaces/load.h" #include "plugin/types.h" -#include "src/uthash.h" -#include "src/utlist.h" +#include "uthash.h" +#include "utlist.h" #include "srpc/common.h" #include diff --git a/src/interfaces/src/plugin/startup/load.c b/src/interfaces/src/plugin/startup/load.c index f35271fb..f639c0e3 100644 --- a/src/interfaces/src/plugin/startup/load.c +++ b/src/interfaces/src/plugin/startup/load.c @@ -18,8 +18,8 @@ #include "plugin/api/interfaces/load.h" #include "plugin/types.h" -#include "src/uthash.h" -#include "src/utlist.h" +#include "uthash.h" +#include "utlist.h" #include "srpc/common.h" #include diff --git a/src/routing/CMakeLists.txt b/src/routing/CMakeLists.txt index c1d0783d..2f821555 100644 --- a/src/routing/CMakeLists.txt +++ b/src/routing/CMakeLists.txt @@ -62,8 +62,12 @@ target_link_libraries( ${NL_LIBRARIES} ) -include_directories( - ${SYSREPO_INCLUDE_DIRS} - ${LIBYANG_INCLUDE_DIRS} - ${NL_INCLUDE_DIRS} -) +target_include_directories( + ${PROJECT_NAME} + PUBLIC ${SYSREPO_INCLUDE_DIRS} + PUBLIC ${LIBYANG_INCLUDE_DIRS} + PUBLIC ${NL_INCLUDE_DIRS} + PUBLIC ${CMAKE_SOURCE_DIR}/src/ + PUBLIC ${CMAKE_SOURCE_DIR}/src/routing + PUBLIC ${CMAKE_SOURCE_DIR}/src/utils + PRIVATE ${CMAKE_SOURCE_DIR}/deps) diff --git a/src/routing/control_plane_protocol.c b/src/routing/control_plane_protocol.c index db2fdcdc..660e86b5 100644 --- a/src/routing/control_plane_protocol.c +++ b/src/routing/control_plane_protocol.c @@ -12,7 +12,7 @@ */ #include "control_plane_protocol.h" -#include "utils/memory.h" +#include "memory.h" #include diff --git a/src/routing/rib.c b/src/routing/rib.c index 1a3d0f30..50cfdf17 100644 --- a/src/routing/rib.c +++ b/src/routing/rib.c @@ -19,7 +19,7 @@ #include "route/list_hash.h" #include "rib.h" -#include "utils/memory.h" +#include "memory.h" void rib_init(struct rib* rib) { diff --git a/src/routing/rib/list.c b/src/routing/rib/list.c index 6331fe3d..d26f6735 100644 --- a/src/routing/rib/list.c +++ b/src/routing/rib/list.c @@ -18,7 +18,7 @@ #include -#include "utils/memory.h" +#include "memory.h" #include "rib.h" #include "rib/list.h" diff --git a/src/routing/route.c b/src/routing/route.c index 3eae1a0b..b55254c3 100644 --- a/src/routing/route.c +++ b/src/routing/route.c @@ -12,7 +12,7 @@ */ #include "route.h" -#include "utils/memory.h" +#include "memory.h" void route_init(struct route* route) { diff --git a/src/routing/route/list_hash.c b/src/routing/route/list_hash.c index 72dfa567..648c5a44 100644 --- a/src/routing/route/list_hash.c +++ b/src/routing/route/list_hash.c @@ -16,7 +16,7 @@ #include "netlink/addr.h" #include "route/list.h" #include "route/list_hash.h" -#include "utils/memory.h" +#include "memory.h" #include diff --git a/src/routing/route/next_hop.c b/src/routing/route/next_hop.c index 0ef6f85e..a7af5491 100644 --- a/src/routing/route/next_hop.c +++ b/src/routing/route/next_hop.c @@ -16,7 +16,7 @@ #include #include "route/next_hop.h" -#include "utils/memory.h" +#include "memory.h" #include diff --git a/src/routing/routing.c b/src/routing/routing.c index 82814723..15ed63d3 100644 --- a/src/routing/routing.c +++ b/src/routing/routing.c @@ -45,7 +45,7 @@ #include "route/list_hash.h" #include "control_plane_protocol.h" #include "sysrepo_types.h" -#include "utils/memory.h" +#include "memory.h" // subs #include "subscription/change.h"