Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ci] Revert disable std::mutex constexpr constructor on Windows (#6736)

Browse Source
This commit is contained in:
Ryan Blue
2024-06-12 16:45:59 -04:00
committed by GitHub
parent 3d6b710293
commit d3aa7f85dd
3 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/modules/CompileWarnings.cmake
View File

@@ -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()

3
vcpkg-configuration.json
View File

@@ -1,3 +0,0 @@
{
"overlay-triplets": [ "./vcpkg-triplets" ]
}

6
vcpkg-triplets/x64-windows-release.cmake
View File

@@ -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 "")