Skip to content

Commit

Permalink
Merge pull request orocos-toolchain#102 from orocos-toolchain/toolcha…
Browse files Browse the repository at this point in the history
…in-2.8

prevent ROS generated messages linking
  • Loading branch information
Ruben Smits committed Jun 12, 2015
2 parents f744423 + dc8cc91 commit 26eb8aa
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion UseOROCOS-RTT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,14 @@ Cflags: -I\${includedir} \@PC_EXTRA_INCLUDE_DIRS\@
if(${PROJECT_NAME}_EXPORTED_LIBRARY_DIRS)
list(REMOVE_DUPLICATES ${PROJECT_NAME}_EXPORTED_LIBRARY_DIRS)
endif()


if(ORO_USE_CATKIN)
if(${PROJECT_NAME}_EXPORTED_LIBRARIES)
list(REMOVE_ITEM ${PROJECT_NAME}_EXPORTED_LIBRARIES ${PROJECT_NAME}_generate_messages_cpp)
list(REMOVE_ITEM ${PROJECT_NAME}_EXPORTED_LIBRARIES ${PROJECT_NAME}_generate_messages_lisp)
list(REMOVE_ITEM ${PROJECT_NAME}_EXPORTED_LIBRARIES ${PROJECT_NAME}_generate_messages_py)
endif()
endif()
# Store a list of exported targets, libraries and include directories on the cache so that other packages within the same workspace can use them.
set(${PC_NAME}_OROCOS_PACKAGE True CACHE INTERNAL "Mark ${PC_NAME} package as an Orocos package built in this workspace")
if(${PROJECT_NAME}_EXPORTED_TARGETS)
Expand Down

0 comments on commit 26eb8aa

Please sign in to comment.