build: Refactor CMake modules

This moves the CMake build logic out of the source tree and splits it
up into a more modular form. The tests now have a CMakeLists.txt file
in their respective source directory.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

10 files changed, 14 insertions, 426 deletions

diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt
deleted file mode 100644
index b3b049e3..00000000
--- a/src/ipcpd/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-set(CONNMGR_RCV_TIMEOUT 1000 CACHE STRING
-  "Timeout for the connection manager to wait for OCEP info (ms).")
-set(IPCP_DEBUG_LOCAL FALSE CACHE BOOL
-  "Use PID as address for local debugging")
-set(IPCP_QOS_CUBE_BE_PRIO 50 CACHE STRING
-  "Priority for best effort QoS cube (0-99)")
-set(IPCP_QOS_CUBE_VIDEO_PRIO 90 CACHE STRING
-  "Priority for video QoS cube (0-99)")
-set(IPCP_QOS_CUBE_VOICE_PRIO 99 CACHE STRING
-  "Priority for voice QoS cube (0-99)")
-set(IPCP_MIN_THREADS 4 CACHE STRING
-  "Minimum number of worker threads in the IPCP")
-set(IPCP_ADD_THREADS 4 CACHE STRING
-  "Number of extra threads to start when an IPCP faces thread starvation")
-set(IPCP_SCHED_THR_MUL 2 CACHE STRING
-  "Number of scheduler threads per QoS cube")
-set(DISABLE_CORE_LOCK TRUE CACHE BOOL
-  "Disable locking performance threads to a core")
-set(DHT_ENROLL_SLACK 50 CACHE STRING
-  "DHT enrollment waiting time (0-999, ms)")
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-   set(IPCP_LINUX_TIMERSLACK_NS 1000 CACHE STRING
-       "Slack value for high resolution timers on Linux systems.")
-endif ()
-
-if ((IPCP_QOS_CUBE_BE_PRIO LESS 0) OR (IPCP_QOS_CUBE_BE_PRIO GREATER 99))
-  message(FATAL_ERROR "Invalid priority for best effort QoS cube")
-endif ()
-
-if ((IPCP_QOS_CUBE_VIDEO_PRIO LESS 0) OR (IPCP_QOS_CUBE_VIDEO_PRIO GREATER 99))
-  message(FATAL_ERROR "Invalid priority for video QoS cube")
-endif ()
-
-if ((IPCP_QOS_CUBE_VOICE_PRIO LESS 0) OR (IPCP_QOS_CUBE_VOICE_PRIO GREATER 99))
-  message(FATAL_ERROR "Invalid priority for voice QoS cube")
-endif ()
-
-if ((DHT_ENROLL_SLACK LESS 0) OR (DHT_ENROLL_SLACK GREATER 999))
-  message(FATAL_ERROR "Invalid DHT slack value")
-endif ()
-
-
-set(IPCP_SOURCES
-  # Add source files here
-  ${CMAKE_CURRENT_SOURCE_DIR}/ipcp.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/shim-data.c
-  )
-
-set (COMMON_SOURCES
-   ${CMAKE_CURRENT_SOURCE_DIR}/common/enroll.c
-  )
-
-add_subdirectory(local)
-add_subdirectory(eth)
-add_subdirectory(udp)
-add_subdirectory(unicast)
-add_subdirectory(broadcast)
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
diff --git a/src/ipcpd/broadcast/CMakeLists.txt b/src/ipcpd/broadcast/CMakeLists.txt
deleted file mode 100644
index d85f335e..00000000
--- a/src/ipcpd/broadcast/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-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_BROADCAST_TARGET ipcpd-broadcast CACHE INTERNAL "")
-set(IPCP_BROADCAST_MPL 60 CACHE STRING
-    "Default maximum packet lifetime for the broadcast IPCP, in seconds")
-
-set(SOURCE_FILES
-  # Add source files here
-  connmgr.c
-  dt.c
-  main.c
-  )
-
-add_executable(ipcpd-broadcast ${SOURCE_FILES} ${IPCP_SOURCES} ${COMMON_SOURCES}
-  ${LAYER_CONFIG_PROTO_SRCS})
-target_link_libraries(ipcpd-broadcast LINK_PUBLIC ouroboros-dev)
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-broadcast -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS ipcpd-broadcast RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
diff --git a/src/ipcpd/config.h.in b/src/ipcpd/config.h.in
index d2af6440..61506196 100644
--- a/src/ipcpd/config.h.in
+++ b/src/ipcpd/config.h.in
@@ -47,7 +47,6 @@
 #define QOS_PRIO_VOICE      @IPCP_QOS_CUBE_VOICE_PRIO@
 #define IPCP_SCHED_THR_MUL  @IPCP_SCHED_THR_MUL@
 #define PFT_SIZE            @PFT_SIZE@
-#define DHT_ENROLL_SLACK    @DHT_ENROLL_SLACK@
 #define IPCP_UNICAST_MPL    @IPCP_UNICAST_MPL@
 #define CONNMGR_RCV_TIMEOUT @CONNMGR_RCV_TIMEOUT@
 
diff --git a/src/ipcpd/eth/CMakeLists.txt b/src/ipcpd/eth/CMakeLists.txt
deleted file mode 100644
index 44299a59..00000000
--- a/src/ipcpd/eth/CMakeLists.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CURRENT_SOURCE_PARENT_DIR})
-include_directories(${CURRENT_BINARY_PARENT_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-find_path(NETMAP_C_INCLUDE_DIR
-  net/netmap_user.h
-  HINTS /usr/include /usr/local/include)
-
-mark_as_advanced(NETMAP_C_INCLUDE_DIR)
-
-# Check for raw sockets
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(DISABLE_RAW_SOCKETS FALSE CACHE BOOL
-    "Disable raw socket support for Ethernet IPCPs")
-  if (NOT DISABLE_RAW_SOCKETS)
-    message(STATUS "Raw socket support for Ethernet IPCPs enabled")
-    set(HAVE_RAW_SOCKETS TRUE PARENT_SCOPE)
-    set(HAVE_RAW_SOCKETS TRUE)
-    set(HAVE_ETH TRUE)
-  else ()
-    message(STATUS "Raw socket support for Ethernet IPCPs disabled by user")
-    unset(HAVE_RAW_SOCKETS PARENT_SCOPE)
-    unset(HAVE_RAW_SOCKETS)
-  endif ()
-endif ()
-
-# Check for BPF
-if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  find_path(BPF_C_INCLUDE_DIR
-    net/bpf.h
-    HINTS /usr/include /usr/local/include)
-
-  mark_as_advanced(BPF_C_INCLUDE_DIR)
-
-  if (BPF_C_INCLUDE_DIR)
-    set(DISABLE_BPF FALSE CACHE BOOL
-      "Disable Berkeley Packet Filter support for Ethernet IPCPs")
-    if (NOT DISABLE_BPF)
-      message(STATUS "Berkeley Packet Filter support "
-        "for Ethernet IPCPs enabled")
-      set(HAVE_BPF TRUE PARENT_SCOPE)
-      set(HAVE_BPF TRUE)
-      set(HAVE_ETH TRUE)
-    else ()
-      message(STATUS "Berkeley Packet Filter support "
-        "for Ethernet IPCPs disabled by user")
-      unset(HAVE_BPF PARENT_SCOPE)
-      unset(HAVE_BPF)
-    endif ()
-  endif ()
-endif ()
-
-# Check for netmap exclusively
-if (NOT HAVE_RAW_SOCKETS AND NOT HAVE_BPF AND NETMAP_C_INCLUDE_DIR)
-  set(DISABLE_NETMAP FALSE CACHE BOOL
-    "Disable netmap support for ETH IPCPs")
-  if (NOT DISABLE_NETMAP)
-    message(STATUS "Netmap support for Ethernet IPCPs enabled")
-    set(HAVE_NETMAP TRUE PARENT_SCOPE)
-    set(HAVE_ETH TRUE)
-  else ()
-    message(STATUS "Netmap support for Ethernet IPCPs disabled by user")
-    unset(HAVE_NETMAP PARENT_SCOPE)
-  endif ()
-endif ()
-
-if (HAVE_ETH)
-  message(STATUS "Supported raw packet API found, building eth-llc and eth-dix")
-
-  set(IPCP_ETH_RD_THR 1 CACHE STRING
-    "Number of reader threads in Ethernet IPCP")
-  set(IPCP_ETH_WR_THR 1 CACHE STRING
-    "Number of writer threads in Ethernet IPCP")
-  set(IPCP_ETH_QDISC_BYPASS false CACHE BOOL
-    "Bypass the Qdisc in the kernel when using raw sockets")
-  set(IPCP_ETH_LO_MTU 1500 CACHE STRING
-    "Restrict Ethernet MTU over loopback interfaces")
-  set(IPCP_ETH_MPL 100 CACHE STRING
-    "Default maximum packet lifetime for the Ethernet IPCPs, in ms")
-
-  set(ETH_LLC_SOURCES
-    # Add source files here
-    llc.c
-  )
-
-  set(ETH_DIX_SOURCES
-    # Add source files here
-    dix.c
-  )
-
-  set(IPCP_ETH_LLC_TARGET ipcpd-eth-llc CACHE INTERNAL "")
-  set(IPCP_ETH_DIX_TARGET ipcpd-eth-dix CACHE INTERNAL "")
-
-  add_executable(ipcpd-eth-llc ${ETH_LLC_SOURCES} ${IPCP_SOURCES})
-  add_executable(ipcpd-eth-dix ${ETH_DIX_SOURCES} ${IPCP_SOURCES})
-
-  if (HAVE_BPF AND NOT APPLE)
-    target_include_directories(ipcpd-eth-llc PUBLIC ${BPF_C_INCLUDE_DIR})
-    target_include_directories(ipcpd-eth-dix PUBLIC ${BPF_C_INCLUDE_DIR})
-  endif ()
-
-  if (HAVE_NETMAP AND NOT APPLE)
-    set_target_properties(ipcpd-eth-llc PROPERTIES
-        COMPILE_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-    set_target_properties(ipcpd-eth-dix PROPERTIES
-        COMPILE_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-    target_include_directories(ipcpd-eth-llc PUBLIC
-      ${NETMAP_C_INCLUDE_DIR})
-    target_include_directories(ipcpd-eth-dix PUBLIC
-      ${NETMAP_C_INCLUDE_DIR})
-  endif ()
-
-  target_link_libraries(ipcpd-eth-llc LINK_PUBLIC ouroboros-dev)
-  target_link_libraries(ipcpd-eth-dix LINK_PUBLIC ouroboros-dev)
-
-  include(AddCompileFlags)
-  if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-    add_compile_flags(ipcpd-eth-llc -DCONFIG_OUROBOROS_DEBUG)
-    add_compile_flags(ipcpd-eth-dix -DCONFIG_OUROBOROS_DEBUG)
-  endif ()
-
-  install(TARGETS ipcpd-eth-llc ipcpd-eth-dix RUNTIME DESTINATION
-    ${CMAKE_INSTALL_SBINDIR})
-endif ()
diff --git a/src/ipcpd/local/CMakeLists.txt b/src/ipcpd/local/CMakeLists.txt
deleted file mode 100644
index f661e9ae..00000000
--- a/src/ipcpd/local/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-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_LOCAL_TARGET ipcpd-local CACHE INTERNAL "")
-set(IPCP_LOCAL_MPL 100 CACHE STRING
-    "Default maximum packet lifetime for the Ethernet IPCPs, in ms")
-
-set(LOCAL_SOURCES
-  # Add source files here
-  ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
-
-add_executable(ipcpd-local ${LOCAL_SOURCES} ${IPCP_SOURCES})
-target_link_libraries(ipcpd-local LINK_PUBLIC ouroboros-common ouroboros-dev)
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-local -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS ipcpd-local RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-
-# Enable once ipcp-local has tests
-# if(BUILD_TESTS)
-#   add_subdirectory(tests)
-# endif ()
diff --git a/src/ipcpd/udp/CMakeLists.txt b/src/ipcpd/udp/CMakeLists.txt
deleted file mode 100644
index 27e32094..00000000
--- a/src/ipcpd/udp/CMakeLists.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-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_UDP4_TARGET ipcpd-udp4 CACHE INTERNAL "")
-set(IPCP_UDP6_TARGET ipcpd-udp6 CACHE INTERNAL "")
-
-set(UDP4_SOURCES
-  # Add source files here
-  udp4.c
-)
-
-set(UDP6_SOURCES
-  # Add source files here
-  udp6.c
-)
-
-add_executable(ipcpd-udp4 ${UDP4_SOURCES} ${IPCP_SOURCES})
-target_link_libraries(ipcpd-udp4 LINK_PUBLIC ouroboros-dev)
-
-add_executable(ipcpd-udp6 ${UDP6_SOURCES} ${IPCP_SOURCES})
-target_link_libraries(ipcpd-udp6 LINK_PUBLIC ouroboros-dev)
-
-
-# Find the nsupdate executable
-find_program(NSUPDATE_EXECUTABLE
-  NAMES nsupdate
-  DOC "The nsupdate tool that enables DDNS")
-
-# Find the nslookup executable
-find_program(NSLOOKUP_EXECUTABLE
-  NAMES nslookup
-  DOC "The nslookup tool that resolves DNS names")
-
-mark_as_advanced(NSLOOKUP_EXECUTABLE NSUPDATE_EXECUTABLE)
-
-if (NSLOOKUP_EXECUTABLE AND NSUPDATE_EXECUTABLE)
-  set(DISABLE_DDNS FALSE CACHE BOOL "Disable DDNS support")
-  if (NOT DISABLE_DNS)
-    message(STATUS "DDNS support enabled")
-    set(HAVE_DDNS TRUE CACHE INTERNAL "")
-  else ()
-    message(STATUS "DDNS support disabled by user")
-    unset(HAVE_DDNS CACHE)
-  endif ()
-else ()
-  if (NSLOOKUP_EXECUTABLE)
-    message(STATUS "Install nsupdate to enable DDNS support")
-  elseif (NSUPDATE_EXECUTABLE)
-    message(STATUS "Install nslookup to enable DDNS support")
-  else ()
-    message(STATUS "Install nslookup and nsupdate to enable DDNS support")
-  endif ()
-endif ()
-
-set(IPCP_UDP_RD_THR 3 CACHE STRING
-  "Number of reader threads in UDP IPCPs")
-set(IPCP_UDP_WR_THR 3 CACHE STRING
-  "Number of writer threads in UDP IPCPs")
-set(IPCP_UDP_MPL 5000 CACHE STRING
-    "Default maximum packet lifetime for the UDP IPCPs, in ms")
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-udp4 -DCONFIG_OUROBOROS_DEBUG)
-  add_compile_flags(ipcpd-udp6 -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS ipcpd-udp4 RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-install(TARGETS ipcpd-udp6 RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-
diff --git a/src/ipcpd/unicast/CMakeLists.txt b/src/ipcpd/unicast/CMakeLists.txt
deleted file mode 100644
index a9155353..00000000
--- a/src/ipcpd/unicast/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR
-  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-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 10000 CACHE STRING
-    "Default maximum packet lifetime for the unicast IPCP, in ms")
-set(DEBUG_PROTO_DHT FALSE CACHE BOOL
-  "Add DHT protocol message output to debug logging")
-set(DEBUG_PROTO_LS FALSE CACHE BOOL
-  "Add link state protocol message output to debug logging")
-
-protobuf_generate_c(DHT_PROTO_SRCS DHT_PROTO_HDRS dir/dht.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(IPCP_UNICAST_SOURCE_FILES
-  # Add source files here
-  addr-auth.c
-  ca.c
-  connmgr.c
-  dir.c
-  dt.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
-  dir/dht.c
-  pff/simple.c
-  pff/alternate.c
-  pff/multipath.c
-  pff/pft.c
-  routing/link-state.c
-  routing/graph.c
-  )
-
-add_executable(ipcpd-unicast ${IPCP_UNICAST_SOURCE_FILES} ${IPCP_SOURCES} ${COMMON_SOURCES}
-  ${DHT_PROTO_SRCS} ${LAYER_CONFIG_PROTO_SRCS})
-target_link_libraries(ipcpd-unicast LINK_PUBLIC ouroboros-dev)
-
-include(AddCompileFlags)
-if (CMAKE_BUILD_TYPE MATCHES "Debug*")
-  add_compile_flags(ipcpd-unicast -DCONFIG_OUROBOROS_DEBUG)
-endif ()
-
-install(TARGETS ipcpd-unicast RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
-
-if(BUILD_TESTS)
-  add_subdirectory(pff/tests)
-  add_subdirectory(routing/tests)
-  add_subdirectory(dir/tests)
-endif ()
diff --git a/src/ipcpd/unicast/dir/tests/CMakeLists.txt b/src/ipcpd/unicast/dir/tests/CMakeLists.txt
index f5f5a74c..bc0f26a4 100644
--- a/src/ipcpd/unicast/dir/tests/CMakeLists.txt
+++ b/src/ipcpd/unicast/dir/tests/CMakeLists.txt
@@ -12,6 +12,12 @@ include_directories(${CURRENT_BINARY_PARENT_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
+# Add includes for ipcp and unicast module files
+include_directories(${CMAKE_SOURCE_DIR}/src/ipcpd)
+include_directories(${CMAKE_BINARY_DIR}/src/ipcpd)
+include_directories(${CMAKE_SOURCE_DIR}/src/ipcpd/unicast)
+include_directories(${CMAKE_BINARY_DIR}/src/ipcpd/unicast)
+
 get_filename_component(PARENT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PARENT_DIR ${PARENT_PATH} NAME)
 
diff --git a/src/ipcpd/unicast/pff/tests/CMakeLists.txt b/src/ipcpd/unicast/pff/tests/CMakeLists.txt
index d224dac0..923d1b27 100644
--- a/src/ipcpd/unicast/pff/tests/CMakeLists.txt
+++ b/src/ipcpd/unicast/pff/tests/CMakeLists.txt
@@ -12,6 +12,10 @@ include_directories(${CURRENT_BINARY_PARENT_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
+# Add includes for ipcp module files
+include_directories(${CMAKE_SOURCE_DIR}/src/ipcpd)
+include_directories(${CMAKE_BINARY_DIR}/src/ipcpd)
+
 get_filename_component(PARENT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PARENT_DIR ${PARENT_PATH} NAME)
 
@@ -34,5 +38,5 @@ endif()
 
 foreach (test ${tests_to_run})
   get_filename_component(test_name ${test} NAME_WE)
-  add_test(${test_name} ${C_TEST_PATH}/${PARENT_DIR}_test ${test_name})
+  add_test(${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${PARENT_DIR}_test ${test_name})
 endforeach (test)
diff --git a/src/ipcpd/unicast/routing/tests/CMakeLists.txt b/src/ipcpd/unicast/routing/tests/CMakeLists.txt
index 7b549995..fb9c92a6 100644
--- a/src/ipcpd/unicast/routing/tests/CMakeLists.txt
+++ b/src/ipcpd/unicast/routing/tests/CMakeLists.txt
@@ -12,6 +12,9 @@ include_directories(${CURRENT_BINARY_PARENT_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
+include_directories(${CMAKE_SOURCE_DIR}/src/ipcpd)
+include_directories(${CMAKE_BINARY_DIR}/src/ipcpd)
+
 get_filename_component(PARENT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PARENT_DIR ${PARENT_PATH} NAME)