[box2d] update to 2.4.1 (#16322)

* [box2d] update to 2.4.1

* update version

* delete patch file

* update version

* update json

* update version
This commit is contained in:
JonLiu1993 2021-02-25 05:58:56 +08:00 committed by GitHub
parent 9c16956fb1
commit c8116498e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 47 deletions

View File

@ -1,5 +0,0 @@
Source: box2d
Version: 2.4.0
Description: An open source C++ engine for simulating rigid bodies in 2D.
Homepage: https://box2d.org
Supports: !uwp

View File

@ -1,36 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ef515f..6975f91 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -95,8 +95,8 @@ set(BOX2D_HEADER_FILES
../include/box2d/b2_world_callbacks.h
../include/box2d/box2d.h)
-add_library(box2d STATIC ${BOX2D_SOURCE_FILES} ${BOX2D_HEADER_FILES})
-target_include_directories(box2d PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+add_library(box2d STATIC ${BOX2D_SOURCE_FILES})
+target_include_directories(box2d PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
target_include_directories(box2d PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
set_target_properties(box2d PROPERTIES
CXX_STANDARD 11
@@ -104,5 +104,18 @@ set_target_properties(box2d PROPERTIES
CXX_EXTENSIONS NO
)
-source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "src" FILES ${BOX2D_SOURCE_FILES})
-source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/../include" PREFIX "include" FILES ${BOX2D_HEADER_FILES})
+install(FILES ${BOX2D_HEADER_FILES} DESTINATION include/box2d)
+
+install(TARGETS box2d
+ EXPORT unofficial-box2d-targets
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+)
+
+install(
+ EXPORT unofficial-box2d-targets
+ FILE unofficial-box2d-config.cmake
+ NAMESPACE unofficial::box2d::
+ DESTINATION share/unofficial-box2d
+)

View File

@ -5,11 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO erincatto/Box2D
REF 4d7757feedc9dd36f64393ae08acfd3b9600ac17 #v2.4.0
SHA512 197f701016c91fda944328e7d867f0a5baa152cce53fa35826986923456af593595bad884008944e041d9ac2e1d769a54eaad4142e19b42a3bb2a2010d814cc9
REF 9ebbbcd960ad424e03e5de6e66a40764c16f51bc #v2.4.1
SHA512 d9fa387ce893ed1fb73f80006491202f2624ef6d0fb37daf92fbd1a7f9071c84da45e4b418b333566435bbbdfd3d5f68a42dfca02416e9a3a2b4db039f1c6151
HEAD_REF master
PATCHES
export-targets.patch
)
vcpkg_configure_cmake(
@ -23,7 +21,7 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-box2d TARGET_PATH share/unofficial-box2d)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/box2d)
vcpkg_copy_pdbs()

7
ports/box2d/vcpkg.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "box2d",
"version-semver": "2.4.1",
"description": "An open source C++ engine for simulating rigid bodies in 2D",
"homepage": "https://box2d.org",
"supports": "!uwp"
}

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fc279cfa6011af543c0b1ebb043767acd13a7930",
"version-semver": "2.4.1",
"port-version": 0
},
{
"git-tree": "61a9394741ba7f08404d1c7f2b77a9d8b9456bc2",
"version-string": "2.4.0",

View File

@ -1001,7 +1001,7 @@
"port-version": 0
},
"box2d": {
"baseline": "2.4.0",
"baseline": "2.4.1",
"port-version": 0
},
"breakpad": {