[urdfdom] Update to 3.1.0

ports/urdfdom-headers/fix-include-path.patch

@@ -1,12 +1,12 @@
 diff --git a/cmake/urdfdom_headers-config.cmake.in b/cmake/urdfdom_headers-config.cmake.in
-index 4686d39..026b65e 100644
+index b53e466..b35805a 100644
 --- a/cmake/urdfdom_headers-config.cmake.in
 +++ b/cmake/urdfdom_headers-config.cmake.in
 @@ -3,8 +3,8 @@ if (@PACKAGE_NAME@_CONFIG_INCLUDED)
  endif()
  set(@PACKAGE_NAME@_CONFIG_INCLUDED TRUE)
 
--set(@PACKAGE_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/include")
+-set(@PACKAGE_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@")
 +set(@PACKAGE_NAME@_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include")
 
 -include("${@PACKAGE_NAME@_DIR}/@[email protected]")

ports/urdfdom-headers/portfile.cmake

@@ -1,41 +1,40 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ros/urdfdom_headers
-    REF a15d906ff16a7fcbf037687b9c63b946c0cc04a1 # 1.0.5
-    SHA512 794acd3b077a1d8fa27d0a698cecbce42f3a7b30f867e79b9897b0d97dcd9e80d2cf3b0c75ee34f628f73afb871c439fffe4a1d7ed85c7fac6553fb1e5b56c36
+    REF 2981892df9da19d10f58dc84de63820e4f554f63 # 1.1.0
+    SHA512 cc47d2fb9781f4c7f1af25ccfb4dc8cc9e72d2ec22cb2fe16866bb0e7ed40494181a413dcd74cb0407b4f5c20262f076f8ae87d605ba0e5477a57ff29ba30967
     HEAD_REF master
     PATCHES fix-include-path.patch
   )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/urdfdom_headers)
+    vcpkg_cmake_config_fixup(CONFIG_PATH CMake PACKAGE_NAME urdfdom_headers)
 else()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/urdfdom_headers/cmake TARGET_PATH share/urdfdom_headers)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/urdfdom_headers)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom_headers)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/urdfdom_headers/cmake PACKAGE_NAME urdfdom_headers)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/urdfdom_headers")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom_headers")
 endif()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
     vcpkg_fixup_pkgconfig()
 endif()
 
 # The config files for this project use underscore
-if(EXISTS ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/share/urdfdom-headers")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/share/urdfdom-headers" "${CURRENT_PACKAGES_DIR}/share/urdfdom_headers")
 endif()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 else()
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/urdfdom-headers/vcpkg.json

@@ -1,7 +1,16 @@
 {
   "name": "urdfdom-headers",
-  "version-string": "1.0.5",
-  "port-version": 2,
+  "version": "1.1.0",
   "description": "The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.",
-  "homepage": "https://github.com/ros/urdfdom_headers"
+  "homepage": "https://github.com/ros/urdfdom_headers",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }

ports/urdfdom/0002_fix_exports.patch

@@ -1,29 +1,20 @@
-From 06aa5a06ee543102bf1a4057601adba3490dad60 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <[email protected]>
-Date: Sun, 3 Sep 2017 23:55:11 +0300
-Subject: [PATCH] fix exports
-
----
- urdf_parser/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
 diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
-index 2158965..c209228 100644
+index ac7c079..4332f26 100644
 --- a/urdf_parser/CMakeLists.txt
 +++ b/urdf_parser/CMakeLists.txt
-@@ -15,10 +15,12 @@ set_target_properties(urdfdom_model PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERS
- add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp)
- target_link_libraries(urdfdom_sensor urdfdom_model ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES})
- set_target_properties(urdfdom_sensor PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION})
-+set_target_properties(urdfdom_sensor PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+@@ -20,9 +20,14 @@ macro(add_urdfdom_library)
+   endif()
+   set_target_properties(${add_urdfdom_library_LIBNAME} PROPERTIES
+     DEFINE_SYMBOL URDFDOM_EXPORTS
+-    SOVERSION ${URDF_MAJOR_MINOR_VERSION})
++    SOVERSION ${URDF_MAJOR_MINOR_VERSION}
++    WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ endmacro()
 
- add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp)
- target_link_libraries(urdfdom_model_state ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES})
- set_target_properties(urdfdom_model_state PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION})
-+set_target_properties(urdfdom_model_state PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
- # --------------------------------
-
--- 
-2.12.2.windows.2
-
++if(MSVC)
++add_definitions(-D_USE_MATH_DEFINES)
++endif()
++
+ if(TARGET console_bridge::console_bridge)
+   set(console_bridge_link_libs "console_bridge::console_bridge")
+ else()

ports/urdfdom/0005-fix-config.patch

@@ -0,0 +1,35 @@
+diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in
+index d8eb93d..240dbe6 100644
+--- a/cmake/urdfdom-config.cmake.in
++++ b/cmake/urdfdom-config.cmake.in
+@@ -3,8 +3,12 @@ if (@PKG_NAME@_CONFIG_INCLUDED)
+ endif()
+ set(@PKG_NAME@_CONFIG_INCLUDED TRUE)
+
+-set(@PKG_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "@TinyXML_INCLUDE_DIRS@")
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++ 
++set(@PKG_NAME@_INCLUDE_DIRS "${_IMPORT_PREFIX}/include" "@TinyXML_INCLUDE_DIRS@")
+
++if (0)
+ foreach(lib @PKG_LIBRARIES@)
+   set(onelib "${lib}-NOTFOUND")
+   set(onelibd "${lib}-NOTFOUND")
+@@ -29,6 +33,10 @@ foreach(lib @PKG_LIBRARIES@)
+   endif()
+   list(APPEND @PKG_NAME@_TARGETS @PROJECT_NAME@::${lib})
+ endforeach()
++endif()
++
++include(CMakeFindDependencyMacro)
++find_dependency(console_bridge)
+
+ foreach(dep @PKG_DEPENDS@)
+   if(NOT ${dep}_FOUND)
+@@ -41,3 +49,5 @@ endforeach()
+ foreach(exp @PKG_EXPORTS@)
+   include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake)
+ endforeach()
++
++set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state)

ports/urdfdom/portfile.cmake

@@ -1,26 +1,28 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO ros/urdfdom
-  REF 0da4b20675cdbe14b532d484a1c17df85b4e1584 # 1.0.4
-  SHA512 cad59307fef466e2bbe3769a4123571d48223ea25a80dde76cb25c9f6dfc961570090d188ddaf8fc93f41f355ffa240eb00abe20cdea4a5ee3e49f56d1258686
-  HEAD_REF master
-  PATCHES
-    0001_use_math_defines.patch
-    0002_fix_exports.patch
-    0004_fix-dependency-console_bridge.patch
-    0005-fix-config-and-install.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ros/urdfdom
+    REF 99ec1f99f2d175f07cc26e63082502ee62982dac # 3.1.0
+    SHA512 64bd96c6b56c300b92e2bd6a875c4bc3c4c5d2ee332a75a8d98099aee0db3e9c33fa7d75fdc4d013e7b6ac47296f524ef713639b06e66035135dfc2a8cca0276
+    HEAD_REF master
+    PATCHES
+        0002_fix_exports.patch
+        0005-fix-config.patch
 )
 
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz AUTO_CLEAN)
+vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz urdf_to_graphviz AUTO_CLEAN)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_cmake_config_fixup(CONFIG_PATH CMake)

ports/urdfdom/vcpkg.json

@@ -1,9 +1,9 @@
 {
   "name": "urdfdom",
-  "version": "1.0.4",
-  "port-version": 5,
+  "version": "3.1.0",
   "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.",
   "homepage": "https://github.com/ros/urdfdom",
+  "license": "BSD-2-Clause",
   "dependencies": [
     "console-bridge",
     "tinyxml",

scripts/ci.baseline.txt

@@ -1116,7 +1116,6 @@ unicorn-lib:x64-uwp=fail
 unittest-cpp:arm64-windows=fail
 unittest-cpp:arm-uwp=fail
 unittest-cpp:x64-uwp=fail
-urdfdom:x64-windows-static=fail
 usd:x86-windows=fail
 uthenticode:arm-uwp=fail
 uthenticode:x64-uwp=fail

versions/baseline.json

@@ -7293,12 +7293,12 @@
       "port-version": 0
     },
     "urdfdom": {
-      "baseline": "1.0.4",
-      "port-version": 5
+      "baseline": "3.1.0",
+      "port-version": 0
     },
     "urdfdom-headers": {
-      "baseline": "1.0.5",
-      "port-version": 2
+      "baseline": "1.1.0",
+      "port-version": 0
     },
     "urho3d": {
       "baseline": "2021-03-01",