Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ports/bullet3/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
if (NOT VCPKG_TARGET_IS_OSX)
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
endif()

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

Expand All @@ -16,9 +18,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
multithreading BULLET2_MULTITHREADING
)

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON
-DBUILD_CPU_DEMOS=OFF
Expand All @@ -30,16 +31,15 @@ vcpkg_configure_cmake(
${FEATURE_OPTIONS}
)

vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()

vcpkg_cmake_config_fixup(PACKAGE_NAME bullet CONFIG_PATH share/bullet)

vcpkg_fixup_cmake_targets(CONFIG_PATH share/bullet TARGET_PATH share/bullet)
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details")

vcpkg_copy_pdbs()

file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

vcpkg_fixup_pkgconfig()
13 changes: 12 additions & 1 deletion ports/bullet3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
{
"name": "bullet3",
"version": "3.17",
"port-version": 2,
"port-version": 3,
"description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library",
"homepage": "https://github.com/bulletphysics/bullet3",
"supports": "!((windows | linux) & (arm | uwp))",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"multithreading": {
"description": "Multithreading functionality for bullet3"
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/bullet3.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "88add55351bf89f89e584924663861c0a827bdf5",
"version": "3.17",
"port-version": 3
},
{
"git-tree": "bcc42d2c8eb5fc4134c31f6176bc0c0ae3bc46e1",
"version": "3.17",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@
},
"bullet3": {
"baseline": "3.17",
"port-version": 2
"port-version": 3
},
"bustache": {
"baseline": "1.1.0",
Expand Down