From 7551432de95d770e33905a6c98f4c00aea6537ad Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 13 Apr 2021 12:46:44 +0200
Subject: [PATCH] cmake: attempt to fix CI with cmake 3.20

---
 .github/workflows/cmake-build-ci.gen |  2 +-
 .github/workflows/cmake-build-ci.yml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 3be65a17..251c4e3e 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -226,7 +226,7 @@ function steps_getdeps($os_vnd) {
 function steps_build() {
 ?>
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
-        run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
       - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
 <?php
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index 4614d1ea..291afa77 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -92,7 +92,7 @@ jobs:
             echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
-        run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
       - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
@@ -174,7 +174,7 @@ jobs:
             echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
-        run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
       - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
@@ -248,7 +248,7 @@ jobs:
             echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
-        run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
       - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
@@ -322,7 +322,7 @@ jobs:
             echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
-        run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
       - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
@@ -388,7 +388,7 @@ jobs:
             rsync
             openssh
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
-        run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
       - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
@@ -542,7 +542,7 @@ jobs:
             echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
-        run: cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
+        run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
       - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
-- 
2.30.2