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
25 changes: 0 additions & 25 deletions ports/dartsim/1478.patch

This file was deleted.

50 changes: 0 additions & 50 deletions ports/dartsim/1497.patch

This file was deleted.

33 changes: 13 additions & 20 deletions ports/dartsim/disable_unit_tests_examples_and_tutorials.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e32147d..5c85186 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,6 +279,7 @@ add_subdirectory(dart)

set(DART_IN_SOURCE_BUILD TRUE)

+if (0)
if(TARGET dart AND NOT DART_BUILD_DARTPY)

# Add a "tests" target to build unit tests.
@@ -330,6 +331,7 @@ if(TARGET dart AND NOT DART_BUILD_DARTPY)
endif(DART_VERBOSE)

endif()
+endif()

if (DART_BUILD_DARTPY)
add_subdirectory(python)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9940065eb8..b25fa4919a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -298,7 +298,7 @@ add_subdirectory(dart)

set(DART_IN_SOURCE_BUILD TRUE)

-if(TARGET dart)
+if(false)

# Add a "tests" target to build unit tests.
enable_testing()
18 changes: 6 additions & 12 deletions ports/dartsim/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO dartsim/dart
REF v6.9.4
SHA512 a9e8712a294286772ee1e3c3899aac7d202f1d3c2b9242ebeaddb2a142787b192d5421a6e3f889dd9ff9ca9e9106b1f893a0c8ab2e1656b04fac6d0be13494ba
HEAD_REF release-6.9
REF v6.11.0
SHA512 01fbff039bcec71d41334db2d07d0973b1ba58d30d05b29e35e1e3cee853917753b64e1101881113a33adb801559855d38d274fbb3383cfb24d85565254d112d
HEAD_REF main
PATCHES
1478.patch
1497.patch
disable_unit_tests_examples_and_tutorials.patch
)

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DDART_VERBOSE=ON
Expand All @@ -26,13 +24,9 @@ vcpkg_configure_cmake(
-DDART_SKIP_pagmo=ON
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(CONFIG_PATH share/dart/cmake TARGET_PATH share/dart)

# Remove pkg-config file as they are broken upstream (https://github.com/dartsim/dart/issues/1496)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
vcpkg_cmake_config_fixup(CONFIG_PATH share/dart/cmake PACKAGE_NAME dart)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
Expand Down
12 changes: 10 additions & 2 deletions ports/dartsim/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dartsim",
"version": "6.9.4",
"version": "6.11.0",
"port-version": 1,
"description": "Dynamic Animation and Robotics Toolkit",
"homepage": "https://dartsim.github.io/",
Expand All @@ -21,6 +21,14 @@
"octomap",
"ode",
"tinyxml2",
"urdfdom"
"urdfdom",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@
"port-version": 2
},
"dartsim": {
"baseline": "6.9.4",
"baseline": "6.11.0",
"port-version": 1
},
"dataframe": {
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/dartsim.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "000785fa5fa81a597b18c374b887ff476182aa50",
"version": "6.11.0",
"port-version": 1
},
{
"git-tree": "104efce0932ef1a1e1e01358a442cfff637b285e",
"version": "6.9.4",
Expand Down