From 71542c0ff1ed7a2e26eea521d59803625b6b598e Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:04:13 -0800 Subject: [PATCH] [joltphysics] Add debug build compile definitions features (#41858) Co-authored-by: LilyWangLL <4945507022qq.com> --- ports/joltphysics/portfile.cmake | 9 +++++++-- ports/joltphysics/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/j-/joltphysics.json | 5 +++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ports/joltphysics/portfile.cmake b/ports/joltphysics/portfile.cmake index ded10e4de1..68227ddcc2 100644 --- a/ports/joltphysics/portfile.cmake +++ b/ports/joltphysics/portfile.cmake @@ -10,6 +10,12 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + debugrenderer DEBUG_RENDERER_IN_DEBUG_AND_RELEASE + profiler PROFILER_IN_DEBUG_AND_RELEASE +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/Build" OPTIONS @@ -23,8 +29,7 @@ vcpkg_cmake_configure( -DUSE_STATIC_MSVC_RUNTIME_LIBRARY=${USE_STATIC_CRT} -DENABLE_ALL_WARNINGS=OFF -DOVERRIDE_CXX_FLAGS=OFF - -DDEBUG_RENDERER_IN_DEBUG_AND_RELEASE=OFF - -DPROFILER_IN_DEBUG_AND_RELEASE=OFF + ${FEATURE_OPTIONS} OPTIONS_RELEASE -DGENERATE_DEBUG_SYMBOLS=OFF ) diff --git a/ports/joltphysics/vcpkg.json b/ports/joltphysics/vcpkg.json index 10f1939369..572c8c66f5 100644 --- a/ports/joltphysics/vcpkg.json +++ b/ports/joltphysics/vcpkg.json @@ -1,7 +1,7 @@ { "name": "joltphysics", "version": "5.1.0", - "port-version": 1, + "port-version": 2, "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", @@ -14,5 +14,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "debugrenderer": { + "description": "Enable debug renderer in Debug and Release builds" + }, + "profiler": { + "description": "Enable the profiler in Debug and Release builds" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index b722dc5760..34f2081322 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3842,7 +3842,7 @@ }, "joltphysics": { "baseline": "5.1.0", - "port-version": 1 + "port-version": 2 }, "josuttis-jthread": { "baseline": "2020-07-21", diff --git a/versions/j-/joltphysics.json b/versions/j-/joltphysics.json index a4b37075c7..6a7cf910f1 100644 --- a/versions/j-/joltphysics.json +++ b/versions/j-/joltphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77fc93156891bade6362a38c0cc5619fce1b6b2b", + "version": "5.1.0", + "port-version": 2 + }, { "git-tree": "be4e60601ee3a8e15476ee5f583a1102e0d53f51", "version": "5.1.0",