diff --git a/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt b/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt index 83efca0e9..7f560c6be 100644 --- a/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt +++ b/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt @@ -13,7 +13,8 @@ add_custom_command(OUTPUT ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATIO DEPENDS Makefile COMMAND cmake -E chdir ${CMAKE_CURRENT_BINARY_DIR} make -f ${PROJECT_SOURCE_DIR}/Makefile PKG_CONFIG_PATH=${CATKIN_DEVEL_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH} PATCH_DIR=${PROJECT_SOURCE_DIR} COMMAND cmake -E make_directory ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION} - COMMAND cmake -E copy ${CMAKE_CURRENT_BINARY_DIR}/urdf_to_collada ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION}) + COMMAND cmake -E copy ${CMAKE_CURRENT_BINARY_DIR}/urdf_to_collada ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION} + COMMAND cmake -E copy ${CMAKE_CURRENT_BINARY_DIR}/collada_to_urdf ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION}) add_dependencies(urdf_to_collada libassimp_devel) diff --git a/jsk_ros_patch/collada_urdf_jsk_patch/Makefile b/jsk_ros_patch/collada_urdf_jsk_patch/Makefile index f67d2f276..c3020edc4 100644 --- a/jsk_ros_patch/collada_urdf_jsk_patch/Makefile +++ b/jsk_ros_patch/collada_urdf_jsk_patch/Makefile @@ -15,6 +15,7 @@ disable_ssl: urdf_to_collada: disable_ssl $(GIT_DIR) patched (cd build/robot_model; PKG_CONFIG_PATH=`rospack find assimp_devel`/lib/pkgconfig:${PKG_CONFIG_PATH} catkin_make --pkg collada_urdf --force-cmake) cp $(BUILD_BIN_DIR)/urdf_to_collada . + cp $(BUILD_BIN_DIR)/collada_to_urdf . clean: if [ -f build/robot_model/build ] ; then catkin_make clean; fi