Skip to content

Commit b939092

Browse files
M2-TEcharles-lunarg
authored andcommitted
properly utilize generator env var
1 parent 409c16b commit b939092

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
cmakeVersion: ${{ matrix.cmake-version }}
3030
- uses: ilammy/msvc-dev-cmd@v1
31-
- run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON -G Ninja
31+
- run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON -G ${{env.CMAKE_GENERATOR}}
3232
- run: cmake --build ./build
3333
- run: cmake --install build/ --prefix build/install
3434
- run: ctest --output-on-failure
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
cmakeVersion: ${{ matrix.cmake-version }}
4848
- uses: ilammy/msvc-dev-cmd@v1
49-
- run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON -G Ninja
49+
- run: cmake -S . -B build -D VULKAN_HEADERS_ENABLE_TESTS=ON -D VULKAN_HEADERS_ENABLE_INSTALL=ON -G ${{env.CMAKE_GENERATOR}}
5050
- run: cmake --build ./build
5151
- run: cmake --install build/ --prefix build/install
5252
- run: ctest --output-on-failure
@@ -68,7 +68,7 @@ jobs:
6868
-D CMAKE_BUILD_TYPE=Release `
6969
-D VULKAN_HEADERS_ENABLE_TESTS=ON `
7070
-D VULKAN_HEADERS_ENABLE_INSTALL=ON `
71-
-G Ninja
71+
-G ${{env.CMAKE_GENERATOR}}
7272
- run: cmake --build ./build
7373
- run: cmake --install build/ --prefix build/install
7474
- run: ctest --output-on-failure
@@ -95,7 +95,7 @@ jobs:
9595
-D VULKAN_HEADERS_ENABLE_MODULE=ON \
9696
-D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF \
9797
-D CMAKE_CXX_COMPILER=${{ matrix.compiler }} \
98-
-G Ninja
98+
-G ${{env.CMAKE_GENERATOR}}
9999
- run: cmake --build ./build
100100
- run: cmake --install build/ --prefix build/install
101101
- run: CXX=${{ matrix.compiler }} ctest --output-on-failure
@@ -120,7 +120,7 @@ jobs:
120120
-D VULKAN_HEADERS_ENABLE_INSTALL=ON `
121121
-D VULKAN_HEADERS_ENABLE_MODULE=ON `
122122
-D VULKAN_HEADERS_ENABLE_MODULE_STD=OFF `
123-
-G Ninja
123+
-G ${{env.CMAKE_GENERATOR}}
124124
- run: cmake --build ./build
125125
- run: cmake --install build/ --prefix build/install
126126
- run: ctest --output-on-failure

0 commit comments

Comments
 (0)