Attachment #233057 for bug #263143




PORTNAME=	ros-urdfdom
DISTVERSION=	3.0.2
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	trueos@norwegianrockcat.com


LICENSE=	BSD3CLAUSE

BUILD_DEPENDS=	ros-urdfdom_headers>=1.0.6:devel/ros-urdfdom_headers
LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
		libconsole_bridge.so:devel/ros-console_bridge
RUN_DEPENDS=	ros-urdfdom_headers>=1.0.6:devel/ros-urdfdom_headers

USES=		cmake compiler:c++11-lang
USE_GITHUB=	yes

Lines 1-3 Link Here

(-)b/devel/ros-urdfdom/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1579889824	1	TIMESTAMP = 1649418618
2	SHA256 (ros-urdfdom-1.0.4_GH0.tar.gz) = 8f3d56b0cbc4b84436d8baf4c8346cd2ee7ffb257bba5ddd9892c41bf516edc4	2	SHA256 (ros-urdfdom-3.0.2_GH0.tar.gz) = 1072b2a304295eb299ed70d99914eb2fbf8843c3257e5e51defc5dd457ee6211
3	SIZE (ros-urdfdom-1.0.4_GH0.tar.gz) = 276958	3	SIZE (ros-urdfdom-3.0.2_GH0.tar.gz) = 286595




--- CMakeLists.txt.orig	2022-03-28 23:52:17 UTC
+++ CMakeLists.txt
@@ -64,7 +64,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 endif()
 
-find_package(console_bridge 0.3 REQUIRED)
+find_package(console_bridge REQUIRED)
 include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
 link_directories(${console_bridge_LIBRARY_DIRS})
 
@@ -56,7 +56,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
 

+    enable_testing()
+endif()
 
 if(WIN32 AND NOT CYGWIN)
   set(CMAKE_CONFIG_INSTALL_DIR CMake)




--- urdf_parser/CMakeLists.txt.orig	2022-03-28 23:52:17 UTC
+++ urdf_parser/CMakeLists.txt
@@ -93,13 +93,15 @@ target_include_directories(urdf_to_graphviz PUBLIC inc
 target_link_libraries(urdf_to_graphviz urdfdom_model)
 
 # urdf_mem_test is a binary for testing, not a unit test
-add_executable(urdf_mem_test test/memtest.cpp)
-target_link_libraries(urdf_mem_test urdfdom_model)
+if (BUILD_TESTING)
 add_executable(urdf_mem_test test/memtest.cpp)
 target_include_directories(urdf_mem_test PUBLIC include)
 target_link_libraries(urdf_mem_test urdfdom_model)
+endif()
 
-include(CTest)
 if(BUILD_TESTING)
   # TODO: check Shane's comment https://github.com/ros/urdfdom/pull/157/files#r664960227
+  include(CTest)
   add_subdirectory(test)
 endif()
 
@@ -108,7 +110,6 @@ INSTALL(
   check_urdf
   urdf_to_graphiz
   urdf_to_graphviz
-  urdf_mem_test
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}




bin/check_urdf
bin/urdf_to_graphiz
include/urdfdom/urdf_parser/exportdecl.h
include/urdfdom/urdf_parser/urdf_parser.h
lib/liburdfdom_model.so
lib/liburdfdom_model.so.3.0
lib/liburdfdom_model_state.so
lib/liburdfdom_model_state.so.3.0
lib/liburdfdom_sensor.so
lib/liburdfdom_sensor.so.3.0
lib/liburdfdom_world.so
lib/liburdfdom_world.so.3.0
lib/urdfdom/cmake/urdfdom-config.cmake
libdata/pkgconfig/urdfdom.pc

Return to bug 263143

Lines 1-6 Link Here

(-)b/devel/ros-urdfdom/Makefile (-4 / +3 lines)
1	PORTNAME= ros-urdfdom	1	PORTNAME= ros-urdfdom
2	DISTVERSION= 1.0.4	2	DISTVERSION= 3.0.2
3	PORTREVISION= 1
4	CATEGORIES= devel	3	CATEGORIES= devel
5		4
6	MAINTAINER= trueos@norwegianrockcat.com	5	MAINTAINER= trueos@norwegianrockcat.com
Lines 8-17 COMMENT= Unified Robot Description Format (URDF) parsers Link Here
8		7
9	LICENSE= BSD3CLAUSE	8	LICENSE= BSD3CLAUSE
10		9
11	BUILD_DEPENDS= ros-urdfdom_headers>0:devel/ros-urdfdom_headers	10	BUILD_DEPENDS= ros-urdfdom_headers>=1.0.6:devel/ros-urdfdom_headers
12	LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \	11	LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \
13	libconsole_bridge.so:devel/ros-console_bridge	12	libconsole_bridge.so:devel/ros-console_bridge
14	RUN_DEPENDS= ros-urdfdom_headers>0:devel/ros-urdfdom_headers	13	RUN_DEPENDS= ros-urdfdom_headers>=1.0.6:devel/ros-urdfdom_headers
15		14
16	USES= cmake compiler:c++11-lang	15	USES= cmake compiler:c++11-lang
17	USE_GITHUB= yes	16	USE_GITHUB= yes

Lines 1-15 Link Here

(-)b/devel/ros-urdfdom/files/patch-CMakeLists.txt (-13 / +4 lines)
1	--- CMakeLists.txt.orig 2020-01-17 18:30:42 UTC	1	--- CMakeLists.txt.orig 2022-03-28 23:52:17 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -41,7 +41,7 @@ if (NOT MSVC)	3	@@ -64,7 +64,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR
4	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
5	endif()
6
7	-find_package(console_bridge 0.3 REQUIRED)
8	+find_package(console_bridge REQUIRED)
9	include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
10	link_directories(${console_bridge_LIBRARY_DIRS})
11
12	@@ -56,7 +56,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR
13	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")	4	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
14	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")	5	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
15		6
Lines 18-22 Link Here
18	+ enable_testing()	9	+ enable_testing()
19	+endif()	10	+endif()
20		11
21	add_subdirectory(urdf_parser)	12	if(WIN32 AND NOT CYGWIN)
22		13	set(CMAKE_CONFIG_INSTALL_DIR CMake)

Lines 1-26 Link Here

(-)b/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt (-14 / +15 lines)
1	--- urdf_parser/CMakeLists.txt.orig 2018-11-14 01:51:13 UTC	1	--- urdf_parser/CMakeLists.txt.orig 2022-03-28 23:52:17 UTC
2	+++ urdf_parser/CMakeLists.txt	2	+++ urdf_parser/CMakeLists.txt
3	@@ -25,17 +25,19 @@ add_executable(urdf_to_graphiz src/urdf_	3	@@ -93,13 +93,15 @@ target_include_directories(urdf_to_graphviz PUBLIC inc
4	target_link_libraries(urdf_to_graphiz urdfdom_model)	4	target_link_libraries(urdf_to_graphviz urdfdom_model)
5		5
6	# urdf_mem_test is a binary for testing, not a unit test	6	# urdf_mem_test is a binary for testing, not a unit test
7	-add_executable(urdf_mem_test test/memtest.cpp)
8	-target_link_libraries(urdf_mem_test urdfdom_model)
9	+if (BUILD_TESTING)	7	+if (BUILD_TESTING)
10	+ add_executable(urdf_mem_test test/memtest.cpp)	8	add_executable(urdf_mem_test test/memtest.cpp)
11	+ target_link_libraries(urdf_mem_test urdfdom_model)	9	target_include_directories(urdf_mem_test PUBLIC include)
		10	target_link_libraries(urdf_mem_test urdfdom_model)
12	+endif()	11	+endif()
13		12
14	-include(CTest)	13	-include(CTest)
15	if(BUILD_TESTING)	14	if(BUILD_TESTING)
		15	# TODO: check Shane's comment https://github.com/ros/urdfdom/pull/157/files#r664960227
16	+ include(CTest)	16	+ include(CTest)
17	add_subdirectory(test)	17	add_subdirectory(test)
18	endif()	18	endif()
19		19
20	INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR})	20	@@ -108,7 +110,6 @@ INSTALL(
21	INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR})	21	check_urdf
22	-INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test	22	urdf_to_graphiz
23	+INSTALL(TARGETS check_urdf urdf_to_graphiz	23	urdf_to_graphviz
24	DESTINATION ${CMAKE_INSTALL_BINDIR})	24	- urdf_mem_test
25	INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR})	25	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
26	INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR})	26	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
		27	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

Lines 1-14 Link Here

(-)b/devel/ros-urdfdom/pkg-plist (-6 / +6 lines)
1	bin/check_urdf	1	bin/check_urdf
2	bin/urdf_to_graphiz	2	bin/urdf_to_graphiz
3	include/urdf_parser/exportdecl.h	3	include/urdfdom/urdf_parser/exportdecl.h
4	include/urdf_parser/urdf_parser.h	4	include/urdfdom/urdf_parser/urdf_parser.h
5	lib/liburdfdom_model.so	5	lib/liburdfdom_model.so
6	lib/liburdfdom_model.so.1.0	6	lib/liburdfdom_model.so.3.0
7	lib/liburdfdom_model_state.so	7	lib/liburdfdom_model_state.so
8	lib/liburdfdom_model_state.so.1.0	8	lib/liburdfdom_model_state.so.3.0
9	lib/liburdfdom_sensor.so	9	lib/liburdfdom_sensor.so
10	lib/liburdfdom_sensor.so.1.0	10	lib/liburdfdom_sensor.so.3.0
11	lib/liburdfdom_world.so	11	lib/liburdfdom_world.so
12	lib/liburdfdom_world.so.1.0	12	lib/liburdfdom_world.so.3.0
13	lib/urdfdom/cmake/urdfdom-config.cmake	13	lib/urdfdom/cmake/urdfdom-config.cmake
14	libdata/pkgconfig/urdfdom.pc	14	libdata/pkgconfig/urdfdom.pc