Apply suggestions from code review

Rely entirely on env variable for the choice of cmake generator

Co-authored-by: jpr42 <109434725+jpr42@users.noreply.github.com>
This commit is contained in:
Jan Kuhlmann 2025-04-03 07:39:03 +00:00 committed by Charles Giessen
parent 9fe6a5263a
commit 8e12a6c7ff

View file

@ -28,7 +28,7 @@ jobs:
with: with:
cmakeVersion: ${{ matrix.cmake-version }} cmakeVersion: ${{ matrix.cmake-version }}
- uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/msvc-dev-cmd@v1
- run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON -G ${{env.CMAKE_GENERATOR}} - run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON
- run: cmake --build ./build - run: cmake --build ./build
- run: cmake --install build/ --prefix build/install - run: cmake --install build/ --prefix build/install
- run: ctest --output-on-failure - run: ctest --output-on-failure
@ -46,7 +46,7 @@ jobs:
with: with:
cmakeVersion: ${{ matrix.cmake-version }} cmakeVersion: ${{ matrix.cmake-version }}
- uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/msvc-dev-cmd@v1
- run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON -G ${{env.CMAKE_GENERATOR}} - run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON
- run: cmake --build ./build - run: cmake --build ./build
- run: cmake --install build/ --prefix build/install - run: cmake --install build/ --prefix build/install
- run: ctest --output-on-failure - run: ctest --output-on-failure
@ -68,7 +68,6 @@ jobs:
-D CMAKE_BUILD_TYPE=Release ` -D CMAKE_BUILD_TYPE=Release `
-D VULKAN_HEADERS_ENABLE_TESTS=ON ` -D VULKAN_HEADERS_ENABLE_TESTS=ON `
-D VULKAN_HEADERS_ENABLE_INSTALL=ON ` -D VULKAN_HEADERS_ENABLE_INSTALL=ON `
-G ${{env.CMAKE_GENERATOR}}
- run: cmake --build ./build - run: cmake --build ./build
- run: cmake --install build/ --prefix build/install - run: cmake --install build/ --prefix build/install
- run: ctest --output-on-failure - run: ctest --output-on-failure
@ -95,7 +94,6 @@ jobs:
-D VULKAN_HEADERS_ENABLE_MODULE=ON \ -D VULKAN_HEADERS_ENABLE_MODULE=ON \
-D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF \ -D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF \
-D CMAKE_CXX_COMPILER=${{ matrix.compiler }} \ -D CMAKE_CXX_COMPILER=${{ matrix.compiler }} \
-G ${{env.CMAKE_GENERATOR}}
- run: cmake --build ./build - run: cmake --build ./build
- run: cmake --install build/ --prefix build/install - run: cmake --install build/ --prefix build/install
- run: CXX=${{ matrix.compiler }} ctest --output-on-failure - run: CXX=${{ matrix.compiler }} ctest --output-on-failure
@ -120,7 +118,6 @@ jobs:
-D VULKAN_HEADERS_ENABLE_INSTALL=ON ` -D VULKAN_HEADERS_ENABLE_INSTALL=ON `
-D VULKAN_HEADERS_ENABLE_MODULE=ON ` -D VULKAN_HEADERS_ENABLE_MODULE=ON `
-D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF ` -D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF `
-G ${{env.CMAKE_GENERATOR}}
- run: cmake --build ./build - run: cmake --build ./build
- run: cmake --install build/ --prefix build/install - run: cmake --install build/ --prefix build/install
- run: ctest --output-on-failure - run: ctest --output-on-failure