From 1a134bcb8e3058bcf8ab2c55d04b242d38d13ba6 Mon Sep 17 00:00:00 2001 From: Sharadh Rajaraman Date: Tue, 30 Sep 2025 21:12:41 +0100 Subject: [PATCH] Remove module config flags from CMake and CI --- .github/workflows/ci.yml | 6 ------ tests/CMakeLists.txt | 4 ---- 2 files changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12ecdcb..03eb1f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,9 +91,6 @@ jobs: cmake -S . -B build \ -D VULKAN_HEADERS_ENABLE_TESTS=ON \ -D VULKAN_HEADERS_ENABLE_INSTALL=ON \ - -D VULKAN_HEADERS_ENABLE_MODULE=ON \ - -D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF \ - -D VULKAN_HEADERS_DISABLE_MODULE_STD=ON \ -D CMAKE_CXX_COMPILER=${{ matrix.compiler }} \ - run: cmake --build ./build - run: cmake --install build/ --prefix build/install @@ -117,9 +114,6 @@ jobs: cmake -S . -B build ` -D VULKAN_HEADERS_ENABLE_TESTS=ON ` -D VULKAN_HEADERS_ENABLE_INSTALL=ON ` - -D VULKAN_HEADERS_ENABLE_MODULE=ON ` - -D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF ` - -D VULKAN_HEADERS_DISABLE_MODULE_STD=ON ` - run: cmake --build ./build - run: cmake --install build/ --prefix build/install - run: ctest --output-on-failure diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3fde6a4..b26f49c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,8 +14,6 @@ add_test(NAME integration.add_subdirectory --build-generator ${CMAKE_GENERATOR} --build-options -DFIND_PACKAGE_TESTING=OFF - -DVULKAN_HEADERS_ENABLE_MODULE=${VULKAN_HEADERS_ENABLE_MODULE} - -DVULKAN_HEADERS_DISABLE_MODULE_STD=${VULKAN_HEADERS_DISABLE_MODULE_STD} ) set(test_install_dir "${CMAKE_CURRENT_BINARY_DIR}/install") @@ -32,8 +30,6 @@ add_test(NAME integration.find_package --build-options -DFIND_PACKAGE_TESTING=ON -DCMAKE_PREFIX_PATH=${test_install_dir} - -DVULKAN_HEADERS_ENABLE_MODULE=${VULKAN_HEADERS_ENABLE_MODULE} - -DVULKAN_HEADERS_DISABLE_MODULE_STD=${VULKAN_HEADERS_DISABLE_MODULE_STD} ) # Installing comes before testing