From a1673f10b6495139ff238fd022c1e07f86a91166 Mon Sep 17 00:00:00 2001 From: Ioannis Konstantelias Date: Thu, 23 Jan 2025 14:02:07 +0000 Subject: [PATCH] Differentiate testing from the release --- .github/workflows/build.yml | 4 ++-- CMakeLists.txt | 7 +++++-- CMakePresets.json | 12 ++++++++++-- src/CMakeLists.txt | 4 +++- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7e1035c..bb000685 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Build on Ubuntu run: | cmake --preset package - cmake --build --preset package --target ptpd2 + cmake --build --preset package openbsd: runs-on: ubuntu-latest @@ -86,4 +86,4 @@ jobs: - name: Build on macOS run: | cmake --preset package - cmake --build --preset package --target ptpd2 + cmake --build --preset package diff --git a/CMakeLists.txt b/CMakeLists.txt index 61b67d69..9333785d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config_cmake.h.in ${CMAKE_CURRENT_BIN include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_compile_definitions(HAVE_CONFIG_H) -include(CTest) -add_subdirectory(external/Unity) +if (${TESTING}) + include(CTest) + add_subdirectory(external/Unity) +endif () + add_subdirectory(src) diff --git a/CMakePresets.json b/CMakePresets.json index dacea38b..64f81758 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -17,7 +17,9 @@ } }, "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_C_COMPILER": "clang", + "TESTING": "ON" } }, { @@ -31,7 +33,8 @@ } }, "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_C_COMPILER": "clang" } } ], @@ -40,6 +43,11 @@ "name": "ut", "configurePreset": "ut", "targets": ["test_time_ops"] + }, + { + "name": "package", + "configurePreset": "package", + "targets": ["ptpd2"] } ], "testPresets": [ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be9060c6..365f7da7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,4 +55,6 @@ target_compile_definitions(ptpd2 PUBLIC $<$:PTPD_STATISTICS> ) -add_subdirectory(unit_tests) +if (${TESTING}) + add_subdirectory(unit_tests) +endif ()