Merge branch 'main' into toolchain

bemanproject · Nov 15, 2024 · 14431a5 · 14431a5
2 parents cc37b1a + 241ba3e
commit 14431a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -112,7 +112,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
@@ -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,11 +27,10 @@ if(DEFINED BEMAN_BUILDSYS_SANITIZER)
     include(cmake/apply_santizers.cmake)
 endif()
 
-include(CTest)
 include(FetchContent)
 include(GNUInstallDirs)
 
-if(BEMAN_EXEMPLAR_BUILD_TESTING)
+if(BEMAN_EXEMPLAR_BUILD_TESTS)
     enable_testing()
 
     # Fetch GoogleTest
@@ -51,7 +50,7 @@ endif()
 
 add_subdirectory(src/beman/exemplar)
 
-if(BEMAN_EXEMPLAR_BUILD_TESTING)
+if(BEMAN_EXEMPLAR_BUILD_TESTS)
     add_subdirectory(tests/beman/exemplar)
 endif()