From b90405a7d2546f571e9c2bf255d726a50e82fa23 Mon Sep 17 00:00:00 2001
From: TellowKrinkle <tellowkrinkle@gmail.com>
Date: Wed, 25 Jan 2023 22:15:28 -0600
Subject: [PATCH] GHActions:Windows: Add CMake clang-cl build

---
 .github/workflows/windows_build_matrix.yml | 14 ++++++++++++--
 .github/workflows/windows_build_qt.yml     |  6 +++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows_build_matrix.yml b/.github/workflows/windows_build_matrix.yml
index 57eaf4fa2a..b6068bd0a7 100644
--- a/.github/workflows/windows_build_matrix.yml
+++ b/.github/workflows/windows_build_matrix.yml
@@ -38,8 +38,8 @@ jobs:
       configuration: Release AVX2
     secrets: inherit
 
-  build_qt_sse4_cmake:
-    name: "CMake SSE4"
+  build_qt_cmake:
+    name: "CMake"
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: Qt
@@ -65,3 +65,13 @@ jobs:
       jobName: Qt Clang
       configuration: Release Clang AVX2
     secrets: inherit
+
+  build_qt_cmake_clang:
+    name: "CMake"
+    uses: ./.github/workflows/windows_build_qt.yml
+    with:
+      jobName: Qt Clang
+      configuration: CMake
+      buildSystem: cmake
+      cmakeFlags: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DPCSX2_EXE_NAME=pcsx2-qt-clang
+    secrets: inherit
diff --git a/.github/workflows/windows_build_qt.yml b/.github/workflows/windows_build_qt.yml
index f3bd3b4965..d34ebbad24 100644
--- a/.github/workflows/windows_build_qt.yml
+++ b/.github/workflows/windows_build_qt.yml
@@ -25,6 +25,10 @@ on:
         required: false
         type: string
         default: msbuild
+      cmakeFlags:
+        required: false
+        type: string
+        default: ""
       qt_binary_url:
         required: false
         type: string
@@ -92,7 +96,7 @@ jobs:
         shell: cmd
         run: |
           call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          cmake . -B build "-DCMAKE_PREFIX_PATH=%cd%\${{ inputs.qt_dir }}" -DQT_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_ADVANCE_SIMD=ON -G Ninja
+          cmake . -B build ${{ inputs.cmakeFlags }} "-DCMAKE_PREFIX_PATH=%cd%\${{ inputs.qt_dir }}" -DQT_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_ADVANCE_SIMD=ON -G Ninja
 
       - name: Build PCSX2
         shell: cmd