[joltphysics] Disable OVERRIDE_CXX_FLAGS option (#38051)

[As suggested by
Dd0yt](https://github.com/microsoft/vcpkg/pull/37997#discussion_r1554483645),
this PR disable the OVERRIDE_CXX_FLAGS option instead of patching it.

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [ ] ~~Any patches that are no longer applied are deleted from the
port's directory.~~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
This commit is contained in:
Rémy Tassoux 2024-04-09 17:37:23 +02:00 committed by GitHub
parent 1c95e6b26b
commit 4c826df5e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 12 deletions

View File

@ -13,17 +13,6 @@ index 830453f..5c9f155 100644
set(CMAKE_CXX_FLAGS_DISTRIBUTION "/GS- /Gy /O2 /Oi /Ot")
set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address /Od")
set(CMAKE_CXX_FLAGS_RELEASEUBSAN "-fsanitize=undefined,implicit-conversion,float-divide-by-zero,local-bounds -fno-sanitize-recover=all")
@@ -184,8 +184,8 @@ else()
# Set compiler flags for various configurations
if (OVERRIDE_CXX_FLAGS)
- set(CMAKE_CXX_FLAGS_DEBUG "")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
endif()
set(CMAKE_CXX_FLAGS_DISTRIBUTION "${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address")
@@ -232,7 +232,11 @@ if (XCODE)
endif()

View File

@ -28,6 +28,7 @@ vcpkg_cmake_configure(
-DINTERPROCEDURAL_OPTIMIZATION=OFF
-DUSE_STATIC_MSVC_RUNTIME_LIBRARY=${USE_STATIC_CRT}
-DENABLE_ALL_WARNINGS=OFF
-DOVERRIDE_CXX_FLAGS=OFF
OPTIONS_RELEASE
-DGENERATE_DEBUG_SYMBOLS=OFF
-DDEBUG_RENDERER_IN_DEBUG_AND_RELEASE=OFF

View File

@ -1,6 +1,7 @@
{
"name": "joltphysics",
"version": "5.0.0",
"port-version": 1,
"description": "A multi core friendly rigid body physics and collision detection library suitable for games and VR applications",
"homepage": "https://github.com/jrouwe/JoltPhysics",
"license": "MIT",

View File

@ -3730,7 +3730,7 @@
},
"joltphysics": {
"baseline": "5.0.0",
"port-version": 0
"port-version": 1
},
"josuttis-jthread": {
"baseline": "2020-07-21",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f81fed7d87903aa8a4be3619dce4cc64596aad5d",
"version": "5.0.0",
"port-version": 1
},
{
"git-tree": "9f3c7087c8c79ef501b33872b730510d2a0a2b2b",
"version": "5.0.0",