Skip to content

Commit

Permalink
exclude ros1 nodelets (ros2#152)
Browse files Browse the repository at this point in the history
* exclude ros1 nodelets

* find_package() only if neccessary

* add todo

Signed-off-by: Dhananjay Sathe <dhananjay.sathe@rapyuta-robotics.com>
  • Loading branch information
Karsten1987 authored and dhananjaysathe committed Aug 22, 2019
1 parent e335868 commit dd579a4
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,12 @@ find_ros1_interface_packages(ros1_message_packages)

set(prefixed_ros1_message_packages "")
foreach(ros1_message_package ${ros1_message_packages})
find_ros1_package(${ros1_message_package} REQUIRED)
list(APPEND prefixed_ros1_message_packages "ros1_${ros1_message_package}")
# TODO(karsten1987): This is currently a workaround to work with ROS 2 classloader
# rather than ROS 1 classloader.
if(NOT "${ros1_message_package}" STREQUAL "nodelet")
find_ros1_package(${ros1_message_package} REQUIRED)
list(APPEND prefixed_ros1_message_packages "ros1_${ros1_message_package}")
endif()
endforeach()

set(TEST_ROS1_BRIDGE FALSE)
Expand Down

0 comments on commit dd579a4

Please sign in to comment.