Remove module config flags from CMake and CI
This commit is contained in:
parent
e64c17c1f9
commit
1a134bcb8e
2 changed files with 0 additions and 10 deletions
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue