build(cmake): fix build of plugins

telekom · Sep 22, 2023 · 2966776 · 2966776
1 parent 5cbb4bd
commit 2966776
Show file tree

Hide file tree

Showing 25 changed files with 35 additions and 30 deletions.
diff --git a/src/bridging/plugin/data/bridge/bridge.h b/src/bridging/plugin/data/bridge/bridge.h
@@ -10,7 +10,7 @@
 #include <stdint.h>
 
 // uthash
-#include <uthash/include/utlist.h>
+#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
@@ -2,7 +2,7 @@
 #include "memory.h"
 #include "plugin/data/bridge/bridge.h"
 
-#include <uthash/include/utlist.h>
+#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
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include <uthash/include/utlist.h>
+#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
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <uthash/include/utlist.h>
+#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
@@ -14,7 +14,7 @@
 #include <sysrepo/xpath.h>
 #include <netlink/socket.h>
 #include <netlink/route/link.h>
-#include <uthash/include/utlist.h>
+#include "utlist.h"
 
 #include "change.h"
 #include "plugin/common.h"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,7 +12,7 @@
  */
 #include "address.h"
 #include "plugin/types.h"
-#include "src/utlist.h"
+#include "utlist.h"
 #include "srpc/common.h"
 
 #include <arpa/inet.h>

diff --git 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
@@ -12,7 +12,7 @@
  */
 #include "address.h"
 #include "plugin/types.h"
-#include "src/utlist.h"
+#include "utlist.h"
 #include <stdlib.h>
 
 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
@@ -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
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "interface_state.h"
-#include "src/uthash.h"
+#include "uthash.h"
 #include <string.h>
 
 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
@@ -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 <libyang/libyang.h>

diff --git 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 <libyang/libyang.h>

diff --git 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
@@ -12,7 +12,7 @@
  */
 
 #include "control_plane_protocol.h"
-#include "utils/memory.h"
+#include "memory.h"
 
 #include <string.h>
 

diff --git 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
@@ -18,7 +18,7 @@
 
 #include <sysrepo.h>
 
-#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
@@ -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
@@ -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 <utlist.h>
 

diff --git a/src/routing/route/next_hop.c b/src/routing/route/next_hop.c
@@ -16,7 +16,7 @@
 #include <sysrepo.h>
 
 #include "route/next_hop.h"
-#include "utils/memory.h"
+#include "memory.h"
 
 #include <utlist.h>
 

diff --git 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"