From 79a16da61e6ab30d2d30ab29aec3aec9c0520df2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 4 May 2022 18:14:22 +0100
Subject: [PATCH] workflows: Change how we make CMake verbose

Some CI workers don't seem to understand `cmake -v`, and Windows' shell
doesn't understand `VERBOSE=1 cmake`.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 .github/workflows/emscripten.yml | 4 ++--
 .github/workflows/main.yml       | 6 +++---
 .github/workflows/msvc.yml       | 2 +-
 .github/workflows/riscos.yml     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index 9ab554bb1..04372bf47 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -11,6 +11,6 @@ jobs:
         with:
           version: 2.0.27
       - name: Configure CMake
-        run: emcmake cmake -B build
+        run: emcmake cmake -B build -DCMAKE_VERBOSE_MAKEFILE=ON
       - name: Build
-        run: cmake -v --build build/
+        run: cmake --build build/
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ed233c1f1..353cdceb1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -82,14 +82,14 @@ jobs:
       if: runner.os == 'Linux'
       run: ./test/versioning.sh
     - name: Configure CMake
-      run: cmake -B build -DSDL_TEST=ON ${{ matrix.platform.flags }}
+      run: cmake -B build -DSDL_TEST=ON -DCMAKE_VERBOSE_MAKEFILE=ON ${{ matrix.platform.flags }}
     - name: Build
-      run: cmake -v --build build/ --config Release
+      run: cmake --build build/ --config Release
     - name: Install
       run: |
         set -eu
         rm -fr DESTDIR-cmake
-        DESTDIR=$(pwd)/DESTDIR-cmake cmake -v --install build/ --config Release
+        DESTDIR=$(pwd)/DESTDIR-cmake cmake --install build/ --config Release
         ( cd DESTDIR-cmake; find ) | LC_ALL=C sort -u
     - name: Configure Autotools
       if: runner.os == 'Linux'
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index a6705d845..ca78cb1c7 100644
--- a/.github/workflows/msvc.yml
+++ b/.github/workflows/msvc.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Configure CMake
       run: cmake -B build -DSDL_TEST=ON ${{ matrix.platform.flags }}
     - name: Build CMake
-      run: cmake -v --build build/ --config Release --parallel
+      run: cmake --build build/ --config Release --parallel
 
     - name: Add msbuild to PATH
       if: ${{ matrix.platform.project != '' }}
diff --git a/.github/workflows/riscos.yml b/.github/workflows/riscos.yml
index aa8233bd7..9f3370567 100644
--- a/.github/workflows/riscos.yml
+++ b/.github/workflows/riscos.yml
@@ -23,6 +23,6 @@ jobs:
       run: apt-get update && apt-get install -y cmake ninja-build
     - uses: actions/checkout@v2
     - name: Configure CMake
-      run: cmake -S. -Bbuild -G Ninja -DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake -DRISCOS=ON -DSDL_GCC_ATOMICS=OFF -DCMAKE_BUILD_TYPE=Release
+      run: cmake -S. -Bbuild -G Ninja -DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake -DRISCOS=ON -DSDL_GCC_ATOMICS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON
     - name: Build
-      run: cmake -v --build build
+      run: cmake --build build