diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-12-11 09:30:07 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-12-11 09:45:04 -0500 |
| commit | 4fd92ec6b203d6b94b9e9f9531fd60a65736e810 (patch) | |
| tree | 2b5be989ca839bd97f55f40605e23d7019397be7 /tests | |
| parent | 1bec4776252cec88ec3336602c0c477c20a1292f (diff) | |
| download | stasis-4fd92ec6b203d6b94b9e9f9531fd60a65736e810.tar.gz | |
Restructure projectdelivery-lib
* Move headers to relevant include directories within the target tree(s)
* Adjust doxygen configuration to search correct paths
* Adjust CMake configuration to use new include paths
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | tests/include/testing.h (renamed from tests/testing.h) | 0 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2564d03..07ba39c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,3 @@ -include_directories( - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_BINARY_DIR}/include -) find_program(BASH_PROGRAM bash) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/tests) set(CTEST_BINARY_DIRECTORY ${PROJECT_BINARY_DIR}/tests) @@ -22,8 +18,6 @@ if (BASH_PROGRAM AND BUILD_TESTING_RT) string(REGEX REPLACE ${ext_pattern} "" rt_name ${rt_file}) add_test (${rt_name} ${BASH_PROGRAM} ${rt_file}) endforeach() - add_test (rt_generic_based_on ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/rt_generic_based_on.sh) - add_test (rt_generic ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/rt_generic.sh) endif() foreach(source_file ${source_files}) @@ -36,6 +30,11 @@ foreach(source_file ${source_files}) elseif (CMAKE_C_COMPILER_ID STREQUAL "MSVC") target_compile_options(${test_executable} PRIVATE ${win_cflags} ${win_msvc_cflags}) endif() + target_include_directories(${test_executable} PRIVATE + ${core_INCLUDE} + ${delivery_INCLUDE} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ) target_link_libraries(${test_executable} PRIVATE stasis_core stasis_delivery diff --git a/tests/testing.h b/tests/include/testing.h index 4c97bf2..4c97bf2 100644 --- a/tests/testing.h +++ b/tests/include/testing.h |