check if windows builds with atomics switch on msvc

radkesvat · Mar 28, 2024 · 14853ae · 14853ae
1 parent 79d6365
commit 14853ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 47 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -30,19 +30,18 @@ jobs:
           - os: windows-latest
             c_compiler: cl
             cpp_compiler: cl
-          - os: ubuntu-latest
+          - os: windows-latest
             c_compiler: gcc
             cpp_compiler: g++
-          - os: ubuntu-latest
+          - os: windows-latest
             c_compiler: clang
             cpp_compiler: clang++
-        exclude:
-          - os: windows-latest
+          - os: ubuntu-latest
             c_compiler: gcc
-          - os: windows-latest
-            c_compiler: clang
+            cpp_compiler: g++
           - os: ubuntu-latest
-            c_compiler: cl
+            c_compiler: clang
+            cpp_compiler: clang++
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/cmake-single-platform.yml b/.github/workflows/cmake-single-platform.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -289,7 +289,7 @@ target_compile_definitions(Waterwall PRIVATE  DEBUG=1)
 endif()
 
 add_compile_options(
-  $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
+  $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX> /experimental:c11atomics
   $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )