Skip to content

Commit 89101b5

Browse files
committed
cmake: attempt to fix CI with cmake 3.20
1 parent 7551432 commit 89101b5

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/cmake-build-ci.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ function steps_package() {
253253
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
254254
if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
255255
run: |
256-
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
256+
cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
257257
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
258258
cmake -DCPACK_COMPONENT_INSTALL=ON build
259259
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package

.github/workflows/cmake-build-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
110110
if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
111111
run: |
112-
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
112+
cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
113113
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
114114
cmake -DCPACK_COMPONENT_INSTALL=ON build
115115
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -191,7 +191,7 @@ jobs:
191191
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
192192
if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
193193
run: |
194-
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
194+
cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
195195
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
196196
cmake -DCPACK_COMPONENT_INSTALL=ON build
197197
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -265,7 +265,7 @@ jobs:
265265
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
266266
if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
267267
run: |
268-
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
268+
cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
269269
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
270270
cmake -DCPACK_COMPONENT_INSTALL=ON build
271271
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -339,7 +339,7 @@ jobs:
339339
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
340340
if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
341341
run: |
342-
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
342+
cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
343343
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
344344
cmake -DCPACK_COMPONENT_INSTALL=ON build
345345
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -405,7 +405,7 @@ jobs:
405405
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
406406
if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
407407
run: |
408-
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
408+
cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
409409
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
410410
cmake -DCPACK_COMPONENT_INSTALL=ON build
411411
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -559,7 +559,7 @@ jobs:
559559
PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
560560
if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new ')
561561
run: |
562-
cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
562+
cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
563563
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
564564
cmake -DCPACK_COMPONENT_INSTALL=ON build
565565
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package

0 commit comments

Comments
 (0)