Skip to content

Commit 7551432

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

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
@@ -226,7 +226,7 @@ function steps_getdeps($os_vnd) {
226226
function steps_build() {
227227
?>
228228
- name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
229-
run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
229+
run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
230230
- name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
231231
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
232232
<?php

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
9393
fi
9494
- name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
95-
run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
95+
run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
9696
- name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
9797
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
9898
- name: Test
@@ -174,7 +174,7 @@ jobs:
174174
echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
175175
fi
176176
- name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
177-
run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
177+
run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
178178
- name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
179179
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
180180
- name: Test
@@ -248,7 +248,7 @@ jobs:
248248
echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
249249
fi
250250
- name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
251-
run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
251+
run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
252252
- name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
253253
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
254254
- name: Test
@@ -322,7 +322,7 @@ jobs:
322322
echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
323323
fi
324324
- name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
325-
run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
325+
run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
326326
- name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
327327
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
328328
- name: Test
@@ -388,7 +388,7 @@ jobs:
388388
rsync
389389
openssh
390390
- name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
391-
run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
391+
run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
392392
- name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
393393
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
394394
- name: Test
@@ -542,7 +542,7 @@ jobs:
542542
echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
543543
fi
544544
- name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
545-
run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
545+
run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
546546
- name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
547547
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
548548
- name: Test

0 commit comments

Comments
 (0)