Skip to content
Snippets Groups Projects
Commit 0fe34bee authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[wip/ros-common-msgs] Fix actionlib_msgs cmake rules for install target

Install .msg files generated from .action under the correct path.
parent 92941b60
No related branches found
No related tags found
No related merge requests found
SHA1 (ros-fuerte-common-msgs_1.8.13.orig.tar.gz) = c8f401c5be32860e40d606b0391be7fc33faf1e5
RMD160 (ros-fuerte-common-msgs_1.8.13.orig.tar.gz) = 62381e1fa63e58b32daf648a19fdf5a86ab42166
Size (ros-fuerte-common-msgs_1.8.13.orig.tar.gz) = 31331 bytes
SHA1 (patch-aa) = 6aa1531093cad0bb787c1d700b62abef0d62e1ea
Install generated .msg in the correct place (not with the full source path
under CMAKE_INSTALL_PREFIX).
--- actionlib_msgs/cmake/actionlib_msgs-extras.cmake.in~ 2012-07-26 20:35:09.000000000 +0200
+++ actionlib_msgs/cmake/actionlib_msgs-extras.cmake.in 2012-10-09 18:23:34.476534949 +0200
@@ -22,13 +22,15 @@
set(DIRECTORY_FULL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_DIRECTORY})
endif()
- # todo, handle relative vs full path
+ # todo, handle relative vs full path XXX handled in robotpkg
_prepend_path(${DIRECTORY_FULL_PATH} "${ARG_FILES}" FILES_W_PATH)
+ # XXX robotpkg tries to handle todo
+ _prepend_path(${ARG_DIRECTORY} "${ARG_FILES}" FILES_WO_PATH)
list(APPEND ${PROJECT_NAME}_ACTION_FILES ${FILES_W_PATH})
if(NOT ARG_NOINSTALL)
- install(FILES ${FILES_W_PATH} DESTINATION share/${PROJECT_NAME}/${ARG_DIRECTORY})
+ install(FILES ${FILES_WO_PATH} DESTINATION share/${PROJECT_NAME}/${ARG_DIRECTORY})
endif()
foreach(actionfile ${FILES_W_PATH})
@@ -54,6 +56,7 @@
endif()
add_message_files(
+ DST actions_gen
DIRECTORY ${OUTPUT_DIR}
FILES ${OUTPUT_FILES})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment