updated v2.2.0

recipe/bld.bat

@@ -1,12 +1,16 @@
+:: MSVC is preferred.
+set CC=cl.exe
+set CXX=cl.exe
+
 mkdir build
 cd build
 cmake ^
     -G "NMake Makefiles" ^
     -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
     -D CMAKE_BUILD_TYPE=Release ^
-    -D CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ^
     -D BUILD_TESTING=FALSE ^
     %SRC_DIR%
 if errorlevel 1 exit 1
-nmake install
+
+cmake --build . --config Release --target install
 if errorlevel 1 exit 1

recipe/meta.yaml

@@ -1,22 +1,21 @@
 {% set name = "urdfdom" %}
-{% set version = "1.0.4" %}
+{% set version = "2.2.0" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
-  url: https://github.com/ros/{{ name }}/archive/{{ version }}.tar.gz
-  sha256: 8f3d56b0cbc4b84436d8baf4c8346cd2ee7ffb257bba5ddd9892c41bf516edc4
+  url: https://github.com/ros2/{{ name }}/archive/{{ version }}.tar.gz
+  sha256: 692b69311d6d18ebd54fea76d4d5320b6ea929ff1c676bc98caaf0be91bdc46e
   patches:
-    - cmake.patch
-    - windows-install.patch
+    - remove_vendor.patch
 
 build:
   number: 0
   skip: true  # [win and vc<14]
   run_exports:
-    - urdfdom
+    - {{ pin_subpackage('urdfdom', max_pin='x.x') }}
 
 requirements:
   build:
@@ -41,15 +40,16 @@ test:
     - if exist %PREFIX%\\Library\\CMake\\urdfdom-config.cmake (exit 0) else (exit 1)  # [win]
 
 about:
-  home: http://github.com/ros/urdfdom
+  home: http://github.com/ros2/urdfdom
   license: BSD-3-Clause
   license_family: BSD
   license_file: LICENSE
   summary: 'URDF parser'
-  dev_url: https://github.com/ros/urdfdom
+  dev_url: https://github.com/ros2/urdfdom
 
 extra:
   recipe-maintainers:
     - jcarpent
     - wolfv
     - lesteve
+    - seanyen

recipe/remove_vendor.patch

@@ -0,0 +1,18 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -32,7 +32,6 @@
+
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+-find_package(tinyxml_vendor REQUIRED)
+ find_package(TinyXML REQUIRED)
+ include_directories(SYSTEM ${TinyXML_INCLUDE_DIRS})
+
+@@ -44,7 +43,6 @@
+   set(CMAKE_CXX_STANDARD 14)
+ endif()
+
+-find_package(console_bridge_vendor REQUIRED) # Provides console_bridge 0.4.0 on platforms without it.
+ find_package(console_bridge REQUIRED)
+ include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
+ link_directories(${console_bridge_LIBRARY_DIRS})