3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[box2d] Update to 2019-12-31 (#9529)

Browse Source 
* [box2d] Update to 2019-12-31

* Udpate ci baseline file

* Update ci baseline file
This commit is contained in:
Phoebe 2020-01-07 03:00:01 +08:00 committed by dan-shaw
parent 8d5b7e3828
commit 140ddf37cd
5 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/box2d/CMakeLists.txt
View File

@ -1,21 +0,0 @@
cmake_minimum_required(VERSION 3.9)
project(Box2d CXX)
file(GLOB_RECURSE SOURCES Box2D/Box2D/*.cpp)
add_library(Box2D ${SOURCES})
target_include_directories(Box2D PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Box2D> $<INSTALL_INTERFACE:include>)
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
)

2
ports/box2d/CONTROL
View File

@ -1,4 +1,4 @@
Source: box2d
Version: 2.3.1-374664b-2
Version: 2019-12-31
Description: An open source C++ engine for simulating rigid bodies in 2D.
Homepage: https://box2d.org

36
ports/box2d/export-targets.patch Normal file
View File

@ -0,0 +1,36 @@
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
+)

24
ports/box2d/portfile.cmake
View File

@ -1,32 +1,30 @@
include(vcpkg_common_functions)
vcpkg_fail_port_install(ON_TARGET "uwp")
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO erincatto/Box2D
REF 374664b2a4ce2e7c24fbad6e1ed34bebcc9ab6bc
SHA512 39074bab01b36104aa685bfe39b40eb903d9dfb54cc3ba8098125db5291f55a8a9e578fc59563b2e8743abbbb26f419be7ae1524e235e7bd759257f99ff96bda
REF 37e2dc25f8da158abda10324d75cb4d1db009adf
SHA512 c9021b6bbc8ee405e38418bdadc136814fb66d5f4928ffd06d2ed016751613ecc3e82e7f60851fdc7a2e13594f68c21e7b7adb06d35a5a02314235132556d174
HEAD_REF master
PATCHES
export-targets.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBUILD_TESTS=OFF
-DBUILD_SAMPLES=OFF
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-box2d TARGET_PATH share/unofficial-box2d)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(
COPY ${SOURCE_PATH}/Box2D/Box2D
DESTINATION ${CURRENT_PACKAGES_DIR}/include
FILES_MATCHING PATTERN "*.h"
)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-box2d TARGET_PATH share/unofficial-box2d)
vcpkg_copy_pdbs()
file(COPY ${SOURCE_PATH}/Box2D/License.txt ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/box2d)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/box2d/License.txt ${CURRENT_PACKAGES_DIR}/share/box2d/copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
scripts/ci.baseline.txt
View File

@ -170,6 +170,8 @@ boost-wave:x64-uwp=fail
botan:arm64-windows=fail
botan:arm-uwp=fail
botan:x64-uwp=fail
box2d:x64-uwp=fail
box2d:arm-uwp=fail
breakpad:arm64-windows=fail
breakpad:x64-osx=fail
brotli:arm-uwp=fail