Update dartsim to 6.15.0

Signed-off-by: Tal Regev <[email protected]>
microsoft · Jan 10, 2025 · 511589e · 511589e
1 parent 81ab9a8
commit 511589e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch
@@ -1,21 +1,21 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 100bfb8b59be..b0779885c788 100644
+index fc5249444a5c..39c29e92bb33 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -292,7 +292,7 @@ add_subdirectory(dart)
+@@ -376,7 +376,7 @@ add_subdirectory(dart)
 
  set(DART_IN_SOURCE_BUILD TRUE)
 
 -if(TARGET dart)
 +if(0)
 
    # Add a "tests" target to build unit tests.
-   enable_testing()
+   include(CTest)
 diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index 08ef983cdcfa..7092d89bb17d 100644
+index 37cadf4f8de1..fcfbd13cf793 100644
 --- a/python/CMakeLists.txt
 +++ b/python/CMakeLists.txt
-@@ -1,6 +1,8 @@
+@@ -22,9 +22,11 @@ endif()
  set(DART_DARTPY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/dartpy")
 
  add_subdirectory(dartpy)
@@ -24,3 +24,6 @@ index 08ef983cdcfa..7092d89bb17d 100644
  add_subdirectory(examples)
  add_subdirectory(tutorials)
 +endif()
+
+ message(STATUS "")
+ message(STATUS "[ dartpy ]")
diff --git a/ports/dartsim/fix-pc-dependencies.patch b/ports/dartsim/fix-pc-dependencies.patch
diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake
@@ -5,11 +5,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dartsim/dart
     REF v${VERSION}
-    SHA512 6d04da37d0eb40a35a3aaec583af024e2edf71d68bb38b6832760de21a349221387644ed9be0cc1e451c669bbf48eb53d8d0cd3be1b1b265a30be2aa17c7e48b
+    SHA512 3c621245c5dc1bf26932c33c940e2b09aaebd1a15f3620616c60296f18a67e1044728543b4f640f92caf8f98295e350679b70eb11aecadea9e4a28aaf370ea75
     HEAD_REF main
     PATCHES
         disable_unit_tests_examples_and_tutorials.patch
-        fix-pc-dependencies.patch
 )
 
 vcpkg_cmake_configure(
@@ -41,7 +40,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_ROOT_PATH \"${SOURCE_PATH}/\"" "")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_PATH \"${SOURCE_PATH}/data/\"" "")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_LOCAL_PATH \"${SOURCE_PATH}/data/\"" "")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_GLOBAL_PATH \"${CURRENT_PACKAGES_DIR}/share/doc/dart/data/\"" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_GLOBAL_PATH                                                  \\\n  \"${CURRENT_PACKAGES_DIR}/share/doc/dart/data/\"" "")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "dartsim",
-  "version": "6.12.2",
-  "port-version": 3,
+  "version": "6.15.0",
   "description": "Dynamic Animation and Robotics Toolkit",
   "homepage": "https://dartsim.github.io/",
   "license": "BSD-2-Clause",
@@ -24,6 +23,7 @@
     "octomap",
     "ode",
     "opengl",
+    "osg",
     "tinyxml2",
     "urdfdom",
     {

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2205,8 +2205,8 @@
       "port-version": 3
     },
     "dartsim": {
-      "baseline": "6.12.2",
-      "port-version": 3
+      "baseline": "6.15.0",
+      "port-version": 0
     },
     "dataframe": {
       "baseline": "3.4.0",

diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "549721c211975510ea627a8b817ee12dae90ae4f",
+      "version": "6.15.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4d586df3f633aafc829fd66b18ad22120a9bbed2",
       "version": "6.12.2",