Enable test only if VKU_ENABLE_TEST flag set to ON.

stripe2933 · Aug 19, 2024 · d03771a · d03771a
1 parent 1a75039
commit d03771a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 35 deletions.
diff --git a/.github/workflows/CMakeUserPresets.json b/.github/workflows/CMakeUserPresets.json
@@ -2,11 +2,18 @@
   "version": 6,
   "configurePresets": [
     {
-      "name": "clang-libstdcxx",
-      "displayName": "Clang + libstdc++",
+      "name": "ci-test",
+      "hidden": true,
       "inherits": "vcpkg",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
+        "VKU_ENABLE_TEST": "ON"
+      }
+    },
+    {
+      "name": "clang",
+      "hidden": true,
+      "inherits": "ci-test",
+      "cacheVariables": {
         "CMAKE_C_COMPILER": "/usr/bin/clang-18",
         "CMAKE_CXX_COMPILER": "/usr/bin/clang++-18"
       },
@@ -19,24 +26,16 @@
     {
       "name": "clang-libcxx",
       "displayName": "Clang + libc++",
-      "inherits": "vcpkg",
+      "inherits": "clang",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_C_COMPILER": "/usr/bin/clang-18",
-        "CMAKE_CXX_COMPILER": "/usr/bin/clang++-18",
         "CMAKE_CXX_FLAGS": "-stdlib=libc++",
         "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++ -lc++abi"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
       }
     },
     {
       "name": "msvc",
       "displayName": "MSVC",
-      "inherits": "vcpkg",
+      "inherits": "ci-test",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
@@ -46,31 +45,16 @@
   ],
   "buildPresets": [
     {
-      "name": "clang-libstdcxx",
-      "configurePreset": "clang-libstdcxx",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      }
+      "name": "clang",
+      "configurePreset": "clang"
     },
     {
       "name": "clang-libcxx",
-      "configurePreset": "clang-libcxx",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      }
+      "configurePreset": "clang-libcxx"
     },
     {
       "name": "msvc",
-      "configurePreset": "msvc",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      }
+      "configurePreset": "msvc"
     }
   ]
 }
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -57,9 +57,9 @@ jobs:
       - name: Configure
         run: |
           mv .github/workflows/CMakeUserPresets.json .
-          cmake --preset=${{ matrix.use_std_module == 'ON' && 'clang-libcxx' || 'clang-libstdcxx' }} \
+          cmake --preset=${{ matrix.use_std_module == 'ON' && 'clang-libcxx' || 'clang' }} \
             -DCMAKE_BUILD_TYPE=${{ matrix.build }} \
             -DVKU_USE_STD_MODULE=${{ matrix.use_std_module }}
 
       - name: Install
-        run: cmake --build --preset=${{ matrix.use_std_module == 'ON' && 'clang-libcxx' || 'clang-libstdcxx' }} --target install
+        run: cmake --build --preset=${{ matrix.use_std_module == 'ON' && 'clang-libcxx' || 'clang' }} --target install
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,6 +24,7 @@ endif()
 option(VKU_USE_STD_MODULE "Use the standard library module for compilation.")
 option(VKU_USE_SHADERC "Add runtime GLSL compilation feature by shaderc.")
 option(VKU_DEFAULT_DYNAMIC_DISPATCHER "Use the vk::DispatchLoaderDynamic as the default dispatcher.")
+option(VKU_ENABLE_TEST "Enable the test targets.")
 
 # ----------------
 # External dependencies.
@@ -103,7 +104,7 @@ add_library(${PROJECT_NAME}::vku ALIAS vku)
 # Tests.
 # --------------------
 
-if (PROJECT_IS_TOP_LEVEL)
+if (VKU_ENABLE_TEST)
     enable_testing()
     add_subdirectory(test)
 endif()