Update cmake-multi-platform.yml

Author: TimGoTheCreator

.github/workflows/cmake-multi-platform.yml

@@ -2,11 +2,9 @@ name: CMake on multiple platforms
 
 on:
   push:
-    branches:
-      - main
-      - adaptiveDt
+    branches: [ main, adaptiveDt ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -24,7 +22,7 @@ jobs:
             c_compiler: cl
             cpp_compiler: cl
 
-          # Windows GCC (MinGW)
+          # Windows MinGW
           - os: windows-latest
             c_compiler: gcc
             cpp_compiler: g++
@@ -45,7 +43,7 @@ jobs:
             c_compiler: clang
             cpp_compiler: clang++
 
-          # macOS (Homebrew LLVM for OpenMP)
+          # macOS
           - os: macos-latest
             c_compiler: clang
             cpp_compiler: clang++
@@ -66,7 +64,7 @@ jobs:
       - uses: actions/checkout@v4
 
       # ------------------------
-      # Install OpenMP + HDF5
+      # Install dependencies
       # ------------------------
 
       - name: Install OpenMP + HDF5 (Ubuntu)
@@ -81,28 +79,21 @@ jobs:
           brew update
           brew install llvm libomp hdf5
 
-      # ------------------------
-      # FIXED: Proper MinGW HDF5 install
-      # ------------------------
       - name: Install MinGW + HDF5 (Windows GCC)
         if: matrix.os == 'windows-latest' && matrix.c_compiler == 'gcc'
         shell: bash
         run: |
           choco install msys2 -y
           C:/tools/msys64/usr/bin/pacman -Syu --noconfirm
           C:/tools/msys64/usr/bin/pacman -S --noconfirm mingw-w64-x86_64-hdf5
-          echo "Using MSYS2 MinGW HDF5"
 
-      # ------------------------
-      # MSVC stays the same
-      # ------------------------
       - name: Install HDF5 (Windows MSVC)
         if: matrix.os == 'windows-latest' && matrix.c_compiler == 'cl'
         run: |
           vcpkg install hdf5
 
       # ------------------------
-      # Set reusable strings
+      # Set build directory
       # ------------------------
       - name: Set reusable strings
         id: strings
@@ -113,6 +104,8 @@ jobs:
       # ------------------------
       # Configure CMake
       # ------------------------
+
+      # macOS (LLVM)
       - name: Configure CMake (macOS)
         if: matrix.os == 'macos-latest'
         run: >
@@ -122,19 +115,37 @@ jobs:
           -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang
           -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++
           -DCMAKE_PREFIX_PATH="/opt/homebrew/opt/llvm;/opt/homebrew/opt/hdf5"
-          -DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp"
-          -DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp"
-          -DOpenMP_C_LIB_NAMES="omp"
-          -DOpenMP_CXX_LIB_NAMES="omp"
-          -DOpenMP_omp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib
-
-      - name: Configure CMake (Others)
-        if: matrix.os != 'macos-latest'
+
+      # Windows MinGW
+      - name: Configure CMake (Windows MinGW)
+        if: matrix.os == 'windows-latest' && matrix.c_compiler == 'gcc'
+        shell: bash
+        run: >
+          cmake -G "MinGW Makefiles"
+          -B ${{ steps.strings.outputs.build-output-dir }}
+          -S ${{ github.workspace }}
+          -DCMAKE_C_COMPILER=gcc
+          -DCMAKE_CXX_COMPILER=g++
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+
+      # Windows MSVC
+      - name: Configure CMake (Windows MSVC)
+        if: matrix.os == 'windows-latest' && matrix.c_compiler == 'cl'
+        run: >
+          cmake -G "Visual Studio 17 2022"
+          -B ${{ steps.strings.outputs.build-output-dir }}
+          -S ${{ github.workspace }}
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+
+      # Linux (Ubuntu)
+      - name: Configure CMake (Linux)
+        if: startsWith(matrix.os, 'ubuntu')
         run: >
           cmake -B ${{ steps.strings.outputs.build-output-dir }}
           -S ${{ github.workspace }}
-          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
           -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
 
       # ------------------------
@@ -151,7 +162,7 @@ jobs:
         run: ctest --build-config ${{ matrix.build_type }}
 
       # ------------------------
-      # Upload build artifacts
+      # Upload artifacts
       # ------------------------
       - name: Upload binaries
         uses: actions/upload-artifact@v4