From 4c64d7daef8819d644ab78a911067b16943f023d Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Mon, 2 Feb 2026 22:50:17 +0100 Subject: build: Refactor CMake back to in-tree CMakeLists This moves the build definitions back to src/ subdirectories (CMakeLists.txt per component). Configuration and dependencies are kept out of tree. Configuration options are bundled into cmake/config/ modules. Dependencies are grouped by component (system/, crypt/, eth/, coverage/, etc.). It now consistently uses target-based commands (target_include_directories, target_link_libraries) instead of global include_directories(). Proper PRIVATE/PUBLIC visibility for executable link libraries. CONFIG_OUROBOROS_DEBUG now properly set based on being a valid debug config (not just checking the string name). It also adds OuroborosTargets export for find_package() support and CMake package config files (OuroborosConfig.cmake) for easier integration with CMake projects. The build logic now follows more idiomatic CMake practices with configuration separated from target definitions. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- cmake/tests.cmake | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'cmake/tests.cmake') diff --git a/cmake/tests.cmake b/cmake/tests.cmake index e3857cab..edc2987c 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -1,30 +1,30 @@ include(CTest) # Sets BUILD_TESTING by default to on. include(utils/TestUtils) +# Test configuration options +include(config/tests) include(utils/DisableTestLogging) -if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) +if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) set(BUILD_TESTS ON) -else () +else() set(BUILD_TESTS OFF) endif() add_custom_target(build_tests) -if (BUILD_TESTS) +if(BUILD_TESTS) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) add_dependencies(check build_tests) +endif() - # Add test subdirectories - add_subdirectory(src/lib/tests) - add_subdirectory(src/lib/ssm/tests) - add_subdirectory(src/irmd/oap/tests) - add_subdirectory(src/ipcpd/unicast/pff/tests) - add_subdirectory(src/ipcpd/unicast/routing/tests) - add_subdirectory(src/ipcpd/unicast/dir/tests) - add_subdirectory(src/irmd/reg/tests) +# Test subdirectories are added from their parent CMakeLists.txt files +# via add_subdirectory(tests) - keeping tests with their source code - # Create coverage target if gcov is available - include(utils/GenCoverage) - create_coverage_target() -endif () +# Coverage target setup (called after all targets are defined) +function(setup_coverage_target) + if(BUILD_TESTS) + include(utils/GenCoverage) + create_coverage_target() + endif() +endfunction() -- cgit v1.2.3