Skip to content

Commit

Permalink
[ci] Revert disable std::mutex constexpr constructor on Windows (wpil…
Browse files Browse the repository at this point in the history
  • Loading branch information
rzblue authored Jun 12, 2024
1 parent 3d6b710 commit d3aa7f8
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 14 deletions.
5 changes: 0 additions & 5 deletions cmake/modules/CompileWarnings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 0 additions & 3 deletions vcpkg-configuration.json

This file was deleted.

6 changes: 0 additions & 6 deletions vcpkg-triplets/x64-windows-release.cmake

This file was deleted.

0 comments on commit d3aa7f8

Please sign in to comment.