From: Michael Wallner Date: Tue, 13 Apr 2021 10:46:44 +0000 (+0200) Subject: cmake: attempt to fix CI with cmake 3.20 X-Git-Tag: 1.1.0-beta3~5 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7551432de95d770e33905a6c98f4c00aea6537ad;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 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 > ${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