Skip to content

Commit f71191f

Browse files
rhaschkewjwwood
authored andcommitted
always (re)create default_plugin_location.cmake - even if it already exists (#1011)
1 parent 1804cbf commit f71191f

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/rviz/default_plugin/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,13 @@ install(TARGETS ${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME}
8080
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
8181

8282
# Generate to the devel space so the extras file can include it from the devel space.
83-
add_custom_command(
84-
OUTPUT ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/cmake/default_plugin_location.cmake
83+
add_custom_target(create_default_plugin_location_file ALL
8584
COMMAND
8685
${CMAKE_COMMAND}
8786
-DPATH_TO_FILE="${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/cmake/default_plugin_location.cmake"
8887
-DDEFAULT_PLUGIN_FILE_NAME=$<TARGET_FILE_NAME:${rviz_DEFAULT_PLUGIN_LIBRARY_TARGET_NAME}>
8988
-P ${CMAKE_CURRENT_SOURCE_DIR}/file_generate_helper.cmake
9089
)
91-
add_custom_target(create_default_plugin_location_file ALL
92-
DEPENDS ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/cmake/default_plugin_location.cmake
93-
)
9490
# TODO(wjwwood): remove the solution above (including the file_generate_helper.cmake file) when we can
9591
# depend on cmake >= 2.8.12 (after dropping Saucy) and use the snippet below.
9692
# file(GENERATE

0 commit comments

Comments
 (0)