From: Michael Wallner <mike@php.net>
Date: Tue, 13 Apr 2021 11:02:43 +0000 (+0200)
Subject: cmake: attempt to fix CI with cmake 3.20
X-Git-Tag: 1.1.0-beta3~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=89101b5c20116bb9120e0fd270a33699d24881aa;p=awesomized%2Flibmemcached

cmake: attempt to fix CI with cmake 3.20
---

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 251c4e3e..278fe076 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -253,7 +253,7 @@ function steps_package() {
           PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
         if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new  ')
         run: |
-          cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+          cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index 291afa77..a86e95ae 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -109,7 +109,7 @@ jobs:
           PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
         if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new  ')
         run: |
-          cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+          cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -191,7 +191,7 @@ jobs:
           PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
         if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new  ')
         run: |
-          cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+          cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -265,7 +265,7 @@ jobs:
           PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
         if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new  ')
         run: |
-          cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+          cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -339,7 +339,7 @@ jobs:
           PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
         if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new  ')
         run: |
-          cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+          cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -405,7 +405,7 @@ jobs:
           PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
         if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new  ')
         run: |
-          cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+          cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
@@ -559,7 +559,7 @@ jobs:
           PUSH_ARTIFACTS_ID: ${{ secrets.PUSH_ARTIFACTS_ID }}
         if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release' && !(env.OS_VER == 'ubuntu-18.04' && env.CC_VND == 'gnu' && env.CC_VER == 'new  ')
         run: |
-          cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+          cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package