add compiler flag to work around msvc bug

rzblue · Jun 9, 2024 · 9c0d28b · 9c0d28b
1 parent b0cc84a
commit 9c0d28b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake
@@ -53,4 +53,9 @@ macro(wpilib_target_warnings target)
     )
         target_compile_options(${target} PRIVATE -gz=zlib)
     endif()
+
+    # Disable std::mutex constexpr constructor on MSCV; Workaround for MSVCP redist mismatch on GHA
+    if(MSVC)
+        target_compile_options(${target} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+    endif()
 endmacro()
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -0,0 +1,3 @@
+{
+    "overlay-triplets": [ "./vcpkg-triplets" ]
+}
diff --git a/vcpkg-triplets/x64-windows-release.cmake b/vcpkg-triplets/x64-windows-release.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
+set(VCPKG_BUILD_TYPE release)
+set(VCPKG_CXX_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_C_FLAGS "")