diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 6c8598e2f..c909cebba 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -82,7 +82,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run CMake
-        run: cmake -S . -B build -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -T ClangCL
+        run: cmake -S . -B build -D CMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe" -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -T ClangCL
       - name: Build
         run: cmake --build build --config Debug --parallel 10
       - name: Test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ee492578..c3413cd4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,9 +47,10 @@ if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux" AND "${CMAKE_CXX_COMPILER_ID}" STR
 endif()
 
 # on Windows with MSVC, add the /bigobj flag to allow for large object files
-if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows" AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
+if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows" AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_COMPILER}" STREQUAL "clang-cl"))
   # If the compiler is MSVC or Clang on Windows, use /bigobj
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+  message(STATUS "Added /bigobj flag to CMAKE_CXX_FLAGS")
 endif()
 
 ################################################################################