diff options
| author | Felix Richter <judge@felixrichter.tech> | 2021-09-30 03:06:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 18:06:21 -0700 |
| commit | dd991ef5b82051cb7481a92c71dc5706325ba7c2 (patch) | |
| tree | 8e9df56d4063006435e0d56a1b450809883e3e51 | |
| parent | bba6b96de18482e118ee1b8883a195a232e2fdef (diff) | |
| download | vcpkg-dd991ef5b82051cb7481a92c71dc5706325ba7c2.tar.gz vcpkg-dd991ef5b82051cb7481a92c71dc5706325ba7c2.zip | |
[rbdl-orb] Update port to version 3.1.2 (#20305)
* update rbdl-orb port to newest source version
* vcpkg x-add-version rbdl-orb
* fixup cmake files location
* update versions database
* Update ports/rbdl-orb/vcpkg.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* update version database
* update port to newest commit on rbdl-orb
* update version database
* update rbdl-orb port
* update version database
* Update versions/r-/rbdl-orb.json
Co-authored-by: Billy O'Neal <bion@microsoft.com>
* Update versions/r-/rbdl-orb.json
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy O'Neal <bion@microsoft.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
| -rw-r--r-- | ports/rbdl-orb/portfile.cmake | 10 | ||||
| -rw-r--r-- | ports/rbdl-orb/vcpkg.json | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/r-/rbdl-orb.json | 5 |
4 files changed, 18 insertions, 8 deletions
diff --git a/ports/rbdl-orb/portfile.cmake b/ports/rbdl-orb/portfile.cmake index 02da8be07..f29acca1f 100644 --- a/ports/rbdl-orb/portfile.cmake +++ b/ports/rbdl-orb/portfile.cmake @@ -7,16 +7,16 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ORB-HD/rbdl-orb
- REF b22abab856a90dbc62e6b2e79f148bd383b5ce43
- SHA512 744a60145243454a9d148971d998ae7a3cc5b9d66131b5d6f3c7be80d6c9ef8b8bf4390b9d1b90b14be6c619c2e1d14c7c6104b3ca6e606e22e3581b548e4f9d
+ REF a2e5428729b636c6232c3b90e4ddac80f7d42b1a
+ SHA512 2a10b3a7ac4e49b0ac5e7204f419a132bef7431c3ba55a72a8d10f9fea1972419682367bda32506b8daf58fc65405c7f3b7fe11fe661fc3dc6c98a3206cf1253
HEAD_REF master
)
vcpkg_from_github(
OUT_SOURCE_PATH PARSER_SOURCE_PATH
REPO ORB-HD/URDF_Parser
- REF 0f3310d766c658b72d54560833012c8fe63ce9d7
- SHA512 6cd8e300cc47b5a5370efb5a4cd843a1621e2832b790daedc1e260ba5bbcaaabdbcddce239f93c3900258093d483d332110ba7e9f0b4b6cda64ce51b6cf2365d
+ REF 8fcc3174743cf3e7561ffb6625524f8133161df4
+ SHA512 6cba22e98f23e74fd7c1dcb356d88b5e24c61913dc900e584ed313b1fcce5d6832ceafcf15a3ea7a56714ab82d3cd7d9f4350d3d242614561c836bd4735e3f4f
)
if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt")
file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser")
@@ -31,6 +31,7 @@ vcpkg_cmake_configure( -DRBDL_BUILD_ADDON_GEOMETRY=ON
-DRBDL_BUILD_ADDON_URDFREADER=ON
-DRBDL_BUILD_EXECUTABLES=OFF
+ -DRBDL_VCPKG_BUILD=ON
)
vcpkg_cmake_install()
@@ -38,5 +39,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/rbdl-orb/vcpkg.json b/ports/rbdl-orb/vcpkg.json index 8b460557a..86920c98e 100644 --- a/ports/rbdl-orb/vcpkg.json +++ b/ports/rbdl-orb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rbdl-orb", - "version": "3.0.0", - "port-version": 1, + "version": "3.1.2", "description": "Rigid Body Dynamics Library - ORB", "homepage": "https://github.com/orb-hd/rbdl-orb", "dependencies": [ @@ -11,6 +10,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 661c07e67..8c4ebc40d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5729,8 +5729,8 @@ "port-version": 1 }, "rbdl-orb": { - "baseline": "3.0.0", - "port-version": 1 + "baseline": "3.1.2", + "port-version": 0 }, "re2": { "baseline": "2021-09-01", diff --git a/versions/r-/rbdl-orb.json b/versions/r-/rbdl-orb.json index f2ec0ef61..b9a6133f8 100644 --- a/versions/r-/rbdl-orb.json +++ b/versions/r-/rbdl-orb.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c6cec01f39c02f0ac2164e31e4615e21a80f4515", + "version": "3.1.2", + "port-version": 0 + }, + { "git-tree": "5850c6901f4123803184bfe9b6e587af9350331a", "version": "3.0.0", "port-version": 1 |