Skip to content

Commit 308d340

Browse files
authored
Merge pull request #1751 from pazeshun/check-franka-ver
[panda_eus] Skip generating dual_panda.l when franka_description or xacro is old to avoid build failure
2 parents 8e7afc0 + 69679f0 commit 308d340

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

jsk_panda_robot/panda_eus/CMakeLists.txt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,22 @@ catkin_package()
1313
###
1414
### dual_panda.l generation
1515
###
16-
if(franka_description_FOUND AND (NOT ("$ENV{ROS_DISTRO}" STRLESS "melodic")))
17-
# xacro.load_yaml cannot be recognized under melodic, while it is recommended on melodic and upper.
18-
# PR introducing xacro.load_yaml: https://github.com/ros/xacro/pull/283
19-
# Related issue: https://github.com/ros/xacro/issues/298
16+
set(_franka_description_min_ver "0.10.0")
17+
set(_xacro_min_ver "1.13.14")
18+
if(franka_description_FOUND
19+
AND (NOT ("${franka_description_VERSION}" VERSION_LESS "${_franka_description_min_ver}"))
20+
AND (NOT ("${xacro_VERSION}" VERSION_LESS "${_xacro_min_ver}")))
21+
# Why franka_description >= 0.10.0:
22+
# dual_panda.urdf.xacro assumes file structure of franka_description >= 0.10.0.
23+
# See https://github.com/frankaemika/franka_ros/compare/0.9.1...0.10.0 for details.
24+
# Why xacro >= 1.13.14:
25+
# xacro.load_yaml cannot be recognized when xacro < 1.13.14, while it is recommended when xacro >= 1.13.14.
26+
# PR introducing xacro.load_yaml: https://github.com/ros/xacro/pull/283
27+
# Related issue: https://github.com/ros/xacro/issues/298
2028
add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/models/dual_panda.l
2129
COMMAND rosrun euscollada collada2eus -I dual_panda.urdf -C dual_panda.yaml -O dual_panda.l
2230
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/models
2331
DEPENDS ${PROJECT_SOURCE_DIR}/models/dual_panda.urdf ${PROJECT_SOURCE_DIR}/models/dual_panda.yaml)
24-
2532
add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/models/dual_panda.urdf
2633
COMMAND rosrun xacro xacro --inorder dual_panda.urdf.xacro > dual_panda.urdf
2734
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/models
@@ -30,6 +37,8 @@ if(franka_description_FOUND AND (NOT ("$ENV{ROS_DISTRO}" STRLESS "melodic")))
3037
add_custom_target(generate_panda_lisp ALL DEPENDS ${PROJECT_SOURCE_DIR}/models/dual_panda.l)
3138
else()
3239
message(WARNING "Dependency is not met, so skip generating dual_panda.l")
40+
message(WARNING "franka_description version: ${franka_description_VERSION}, must be >= ${_franka_description_min_ver}")
41+
message(WARNING "xacro version: ${xacro_VERSION}, must be >= ${_xacro_min_ver}")
3342
endif()
3443

3544

0 commit comments

Comments
 (0)