diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b2f51d..e3a9fdf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -476,6 +476,10 @@ jobs:
         include:
           - os: windows-2019
           - os: windows-2022
+          - os: windows-2022
+            cmake_args: -T ClangCL -A x64
+          - os: windows-2022
+            cmake_args: -T ClangCL -A Win32
 
     runs-on: ${{matrix.os}}
 
@@ -507,7 +511,7 @@ jobs:
         run: |
           cd ../boost-root/libs/%LIBRARY%/test/cmake_subdir_test
           mkdir __build__ && cd __build__
-          cmake ..
+          cmake ${{ matrix.cmake_args }} ..
           cmake --build . --config Debug
           ctest --output-on-failure --no-tests=error -C Debug
 
@@ -515,6 +519,7 @@ jobs:
         shell: cmd
         run: |
           cd ../boost-root/libs/%LIBRARY%/test/cmake_subdir_test/__build__
+          cmake ${{ matrix.cmake_args }} ..
           cmake --build . --config Release
           ctest --output-on-failure --no-tests=error -C Release
 
@@ -525,6 +530,10 @@ jobs:
         include:
           - os: windows-2019
           - os: windows-2022
+          - os: windows-2022
+            cmake_args: -T ClangCL -A x64
+          - os: windows-2022
+            cmake_args: -T ClangCL -A Win32
 
     runs-on: ${{matrix.os}}
 
@@ -556,7 +565,7 @@ jobs:
         run: |
           cd ../boost-root
           mkdir __build__ && cd __build__
-          cmake -DBOOST_INCLUDE_LIBRARIES=%LIBRARY% -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ..
+          cmake -DBOOST_INCLUDE_LIBRARIES=%LIBRARY% -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ${{ matrix.cmake_args }} ..
 
       - name: Install (Debug)
         shell: cmd
@@ -574,7 +583,7 @@ jobs:
         shell: cmd
         run: |
           cd ../boost-root/libs/%LIBRARY%/test/cmake_install_test && mkdir __build__ && cd __build__
-          cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ..
+          cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ${{ matrix.cmake_args }} ..
           cmake --build . --config Debug
           ctest --output-on-failure --no-tests=error -C Debug
 
@@ -582,6 +591,7 @@ jobs:
         shell: cmd
         run: |
           cd ../boost-root/libs/%LIBRARY%/test/cmake_install_test/__build__
+          cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ${{ matrix.cmake_args }} ..
           cmake --build . --config Release
           ctest --output-on-failure --no-tests=error -C Release
 
@@ -592,6 +602,10 @@ jobs:
         include:
           - os: windows-2019
           - os: windows-2022
+          - os: windows-2022
+            cmake_args: -T ClangCL -A x64
+          - os: windows-2022
+            cmake_args: -T ClangCL -A Win32
 
     runs-on: ${{matrix.os}}
 
@@ -623,7 +637,7 @@ jobs:
         run: |
           cd ../boost-root
           mkdir __build__ && cd __build__
-          cmake -DBOOST_INCLUDE_LIBRARIES=%LIBRARY% -DBUILD_TESTING=ON ..
+          cmake -DBOOST_INCLUDE_LIBRARIES=%LIBRARY% -DBUILD_TESTING=ON ${{ matrix.cmake_args }} ..
 
       - name: Build tests (Debug)
         shell: cmd