From ec6192b309f3c6caa22ab0eff8ce5be37782af88 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Thu, 14 Nov 2024 15:48:05 -0500 Subject: [PATCH 1/5] conditional include of ctest --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e73ca3..cacf1cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,11 +23,12 @@ option( ${PROJECT_IS_TOP_LEVEL} ) -include(CTest) -include(FetchContent) include(GNUInstallDirs) if(BEMAN_EXEMPLAR_BUILD_TESTING) + include(CTest) + include(FetchContent) + enable_testing() # Fetch GoogleTest From 82af6943daced0e0c46bfc35907a3db54ec5253d Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:51:14 -0500 Subject: [PATCH 2/5] Remove ctest --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cacf1cf..735e43b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,6 @@ option( include(GNUInstallDirs) if(BEMAN_EXEMPLAR_BUILD_TESTING) - include(CTest) include(FetchContent) enable_testing() From 2f17c8836075a0eb4f77c88a750a7b8293ad8f4b Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:39:45 -0500 Subject: [PATCH 3/5] Apply updated [CMAKE.SKIP_TESTS] --- .github/workflows/ci_tests.yml | 2 +- CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 7c62dd5..25da7d0 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -108,7 +108,7 @@ jobs: matrix: args: - name: "Disable build testing" - arg: "-DBEMAN_EXEMPLAR_BUILD_TESTING=OFF" + arg: "-DBEMAN_EXEMPLAR_BUILD_TESTS=OFF" - name: "Disable example building" arg: "-DBEMAN_EXEMPLAR_BUILD_EXAMPLES=OFF" name: "CMake: ${{ matrix.args.name }}" diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e73ca3..65443dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project( # [CMAKE.SKIP_TESTS] option( - BEMAN_EXEMPLAR_BUILD_TESTING + BEMAN_EXEMPLAR_BUILD_TESTS "Enable building tests and test infrastructure. Default: ON. Values: { ON, OFF }." ${PROJECT_IS_TOP_LEVEL} ) @@ -27,7 +27,7 @@ include(CTest) include(FetchContent) include(GNUInstallDirs) -if(BEMAN_EXEMPLAR_BUILD_TESTING) +if(BEMAN_EXEMPLAR_BUILD_TESTS) enable_testing() # Fetch GoogleTest @@ -47,7 +47,7 @@ endif() add_subdirectory(src/beman/exemplar) -if(BEMAN_EXEMPLAR_BUILD_TESTING) +if(BEMAN_EXEMPLAR_BUILD_TESTS) add_subdirectory(tests/beman/exemplar) endif() From 16af6fa1df92044006400cb39c569a879e625098 Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:11:23 -0500 Subject: [PATCH 4/5] Update CMakeLists.txt Co-authored-by: David Sankel --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 735e43b..5f9e42f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,10 +23,10 @@ option( ${PROJECT_IS_TOP_LEVEL} ) +include(FetchContent) include(GNUInstallDirs) if(BEMAN_EXEMPLAR_BUILD_TESTING) - include(FetchContent) enable_testing() From 105c8688474c779d99ebe6099ef3a176ab241c5a Mon Sep 17 00:00:00 2001 From: River <26424577+wusatosi@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:12:22 -0500 Subject: [PATCH 5/5] Update CMakeLists.txt Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f9e42f..8bfe930 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ include(FetchContent) include(GNUInstallDirs) if(BEMAN_EXEMPLAR_BUILD_TESTING) - enable_testing() # Fetch GoogleTest