From d3aa7f85dd3b141ec54c737fba759728af6c35a4 Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Wed, 12 Jun 2024 16:45:59 -0400 Subject: [PATCH] [ci] Revert disable std::mutex constexpr constructor on Windows (#6736) --- cmake/modules/CompileWarnings.cmake | 5 ----- vcpkg-configuration.json | 3 --- vcpkg-triplets/x64-windows-release.cmake | 6 ------ 3 files changed, 14 deletions(-) delete mode 100644 vcpkg-configuration.json delete mode 100644 vcpkg-triplets/x64-windows-release.cmake diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake index a37cd749c2..5de103201e 100644 --- a/cmake/modules/CompileWarnings.cmake +++ b/cmake/modules/CompileWarnings.cmake @@ -53,9 +53,4 @@ 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 deleted file mode 100644 index 0a4b403bf4..0000000000 --- a/vcpkg-configuration.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "overlay-triplets": [ "./vcpkg-triplets" ] -} diff --git a/vcpkg-triplets/x64-windows-release.cmake b/vcpkg-triplets/x64-windows-release.cmake deleted file mode 100644 index 8a7da5b914..0000000000 --- a/vcpkg-triplets/x64-windows-release.cmake +++ /dev/null @@ -1,6 +0,0 @@ -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 "")