From 73b14e08e2f85bc0357f9ac879112ed8247529af Mon Sep 17 00:00:00 2001 From: ddgg-el <104137441+ddgg-el@users.noreply.github.com> Date: Tue, 24 Feb 2026 21:23:10 +0100 Subject: [PATCH 1/2] Conditionalize runtime test output directory setting With difference project folder structure the user can set the C74_LIBRARY_TEST_OUTPUT_DIRECTORY to change the default path of the test output folder (pretty much like C74_LIBRARY_OUTPUT_DIRECTORY) --- test/min-object-unittest.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test/min-object-unittest.cmake b/test/min-object-unittest.cmake index fe65aed..37b3e31 100644 --- a/test/min-object-unittest.cmake +++ b/test/min-object-unittest.cmake @@ -30,15 +30,23 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp") # set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage") # set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage") # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") + if(DEFINED C74_LIBRARY_TEST_OUTPUT_DIRECTORY ) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY C74_LIBRARY_TEST_OUTPUT_DIRECTORY) + else() + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../tests") + endif() - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../tests") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") add_executable(${TEST_NAME} ${TEST_NAME}.cpp ${TEST_SOURCE_FILES}) if (NOT TARGET mock_kernel) - set(C74_MOCK_TARGET_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../tests") + if(DEFINED C74_LIBRARY_TEST_OUTPUT_DIRECTORY ) + set(C74_MOCK_TARGET_DIR C74_LIBRARY_TEST_OUTPUT_DIRECTORY) + else() + set(C74_MOCK_TARGET_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../tests") + endif() add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../test/mock ${CMAKE_BINARY_DIR}/mock) endif () @@ -67,4 +75,4 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp") COMMAND ${TEST_NAME}) endif () - \ No newline at end of file + From 2d4019bcaa6bb109d37c815b537cefdafafd9f0e Mon Sep 17 00:00:00 2001 From: ddgg-el <104137441+ddgg-el@users.noreply.github.com> Date: Tue, 24 Feb 2026 21:53:57 +0100 Subject: [PATCH 2/2] Fix output directory variable usage in CMake --- test/min-object-unittest.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/min-object-unittest.cmake b/test/min-object-unittest.cmake index 37b3e31..d4da81c 100644 --- a/test/min-object-unittest.cmake +++ b/test/min-object-unittest.cmake @@ -31,7 +31,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp") # set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage") # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") if(DEFINED C74_LIBRARY_TEST_OUTPUT_DIRECTORY ) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY C74_LIBRARY_TEST_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${C74_LIBRARY_TEST_OUTPUT_DIRECTORY}") else() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../tests") endif() @@ -43,7 +43,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp") if (NOT TARGET mock_kernel) if(DEFINED C74_LIBRARY_TEST_OUTPUT_DIRECTORY ) - set(C74_MOCK_TARGET_DIR C74_LIBRARY_TEST_OUTPUT_DIRECTORY) + set(C74_MOCK_TARGET_DIR "${C74_LIBRARY_TEST_OUTPUT_DIRECTORY}") else() set(C74_MOCK_TARGET_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../tests") endif()