From 8e12a6c7ff788924055ac771ba8ddb8f4485f913 Mon Sep 17 00:00:00 2001 From: Jan Kuhlmann <33833587+M2-TE@users.noreply.github.com> Date: Thu, 3 Apr 2025 07:39:03 +0000 Subject: [PATCH] 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> --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ae07ab..ff6c659 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: with: cmakeVersion: ${{ matrix.cmake-version }} - 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 --install build/ --prefix build/install - run: ctest --output-on-failure @@ -46,7 +46,7 @@ jobs: with: cmakeVersion: ${{ matrix.cmake-version }} - 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 --install build/ --prefix build/install - run: ctest --output-on-failure @@ -68,7 +68,6 @@ jobs: -D CMAKE_BUILD_TYPE=Release ` -D VULKAN_HEADERS_ENABLE_TESTS=ON ` -D VULKAN_HEADERS_ENABLE_INSTALL=ON ` - -G ${{env.CMAKE_GENERATOR}} - run: cmake --build ./build - run: cmake --install build/ --prefix build/install - run: ctest --output-on-failure @@ -95,7 +94,6 @@ jobs: -D VULKAN_HEADERS_ENABLE_MODULE=ON \ -D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF \ -D CMAKE_CXX_COMPILER=${{ matrix.compiler }} \ - -G ${{env.CMAKE_GENERATOR}} - run: cmake --build ./build - run: cmake --install build/ --prefix build/install - run: CXX=${{ matrix.compiler }} ctest --output-on-failure @@ -120,7 +118,6 @@ jobs: -D VULKAN_HEADERS_ENABLE_INSTALL=ON ` -D VULKAN_HEADERS_ENABLE_MODULE=ON ` -D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF ` - -G ${{env.CMAKE_GENERATOR}} - run: cmake --build ./build - run: cmake --install build/ --prefix build/install - run: ctest --output-on-failure