1 files changed, 21 insertions, 48 deletions

diff --git a/src/ipcpd/unicast/CMakeLists.txt b/src/ipcpd/unicast/CMakeLists.txt
index e1fe1074..d3388112 100644
--- a/src/ipcpd/unicast/CMakeLists.txt
+++ b/src/ipcpd/unicast/CMakeLists.txt
@@ -1,50 +1,19 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
+# Unicast IPCP build configuration
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+protobuf_generate_c(DHT_PROTO_SRCS DHT_PROTO_HDRS
+  "${CMAKE_CURRENT_SOURCE_DIR}/dir/dht.proto")
 
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-include_directories(${CURRENT_BINARY_PARENT_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(IPCP_UNICAST_TARGET ipcpd-unicast CACHE INTERNAL "")
-set(IPCP_UNICAST_MPL 60 CACHE STRING
-    "Default maximum packet lifetime for the unicast IPCP, in seconds")
-
-protobuf_generate_c(KAD_PROTO_SRCS KAD_PROTO_HDRS dir/kademlia.proto)
-
-math(EXPR PFT_EXPR "1 << 12")
-set(PFT_SIZE ${PFT_EXPR} CACHE STRING
-  "Size of the PDU forwarding table")
-if (HAVE_FUSE)
-  set(IPCP_FLOW_STATS TRUE CACHE BOOL
-    "Enable flow statistics tracking in IPCP")
-    if (IPCP_FLOW_STATS)
-       message(STATUS "IPCP flow statistics enabled")
-    else ()
-       message(STATUS "IPCP flow statistics disabled")
-    endif ()
-endif ()
-
-set(SOURCE_FILES
-  # Add source files here
+set(UNICAST_SOURCES
   addr-auth.c
   ca.c
   connmgr.c
   dir.c
   dt.c
-  enroll.c
   fa.c
   main.c
   pff.c
   routing.c
   psched.c
-  # Add policies last
   addr-auth/flat.c
   ca/mb-ecn.c
   ca/nop.c
@@ -55,22 +24,26 @@ set(SOURCE_FILES
   pff/pft.c
   routing/link-state.c
   routing/graph.c
-  )
+)
 
-add_executable(ipcpd-unicast ${SOURCE_FILES} ${IPCP_SOURCES}
-  ${KAD_PROTO_SRCS} ${LAYER_CONFIG_PROTO_SRCS})
-target_link_libraries(ipcpd-unicast LINK_PUBLIC ouroboros-dev)
+add_executable(${IPCP_UNICAST_TARGET}
+  ${UNICAST_SOURCES}
+  ${IPCP_SOURCES}
+  ${COMMON_SOURCES}
+  ${DHT_PROTO_SRCS}
+)
 
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-unicast -DCONFIG_OUROBOROS_DEBUG)
-endif ()
+target_include_directories(${IPCP_UNICAST_TARGET} PRIVATE ${IPCP_INCLUDE_DIRS})
+target_include_directories(${IPCP_UNICAST_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(${IPCP_UNICAST_TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(${IPCP_UNICAST_TARGET} PRIVATE ouroboros-dev)
 
-install(TARGETS ipcpd-unicast RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
+ouroboros_target_debug_definitions(${IPCP_UNICAST_TARGET})
 
-add_subdirectory(pff/tests)
-add_subdirectory(routing/tests)
+install(TARGETS ${IPCP_UNICAST_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
-if (NOT GNU)
+if(BUILD_TESTS)
   add_subdirectory(dir/tests)
-endif ()
+  add_subdirectory(pff/tests)
+  add_subdirectory(routing/tests)
+endif()