diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 39bb69f8ed2633..79bcf0cda88bd4 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -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) @@ -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 @@ -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() diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json index 7aa0e9feb1acde..6de08ff9fcb08f 100644 --- a/ports/bullet3/vcpkg.json +++ b/ports/bullet3/vcpkg.json @@ -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" diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index 49a5583439717c..111e48e1a730a9 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88add55351bf89f89e584924663861c0a827bdf5", + "version": "3.17", + "port-version": 3 + }, { "git-tree": "bcc42d2c8eb5fc4134c31f6176bc0c0ae3bc46e1", "version": "3.17", diff --git a/versions/baseline.json b/versions/baseline.json index 0e1de0bb9637a8..a36e285ffcfe36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1170,7 +1170,7 @@ }, "bullet3": { "baseline": "3.17", - "port-version": 2 + "port-version": 3 }, "bustache": { "baseline": "1.1.0",