From e6ca34d90eb8dc269020e9c9b05b079d670dc201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Gro=C3=9F?= <julian.g@posteo.de>
Date: Fri, 7 Mar 2025 10:34:57 +0100
Subject: [PATCH] Consolidate  "Configure CMake" steps.

---
 .github/workflows/pr_build.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index d37fe83892..fa68e4a58e 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -261,16 +261,15 @@ jobs:
         path: ~/.conan2/
 
     - name: Configure CMake
-      if: startsWith(matrix.os, 'Windows') == false
       shell: bash
-           # This syntax requires CMake 3.23
-      run: cmake --preset conan-${BUILD_TYPE,,} $CMAKE_EXTRA
-
-    - name: Configure CMake (Windows)
-      if: startsWith(matrix.os, 'Windows')
-      shell: bash
-           # This syntax requires CMake 3.23
-      run: cmake --preset conan-default $CMAKE_EXTRA
+      run: |
+        if [[ "${{ matrix.os }}" =~ "Windows"; then
+          # This syntax requires CMake 3.23
+          cmake --preset conan-default $CMAKE_EXTRA  # Why does Conan not provide the preset we tell it to on Windows?
+        else
+          # This syntax requires CMake 3.23
+          cmake --preset conan-${BUILD_TYPE,,} $CMAKE_EXTRA
+        fi
 
     - name: Build Application
       if: matrix.build_type == 'full' || matrix.build_type == 'client'