diff --git a/libraries/create_publisher.sh b/libraries/create_publisher.sh index 437972a2bac2e85858e7345f680d3f7c4eb8d87e..3c261bee3b5801e998587da26369c86de8b835e2 100755 --- a/libraries/create_publisher.sh +++ b/libraries/create_publisher.sh @@ -395,9 +395,9 @@ function create_publisher add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "${msg_pkg}" if [[ "${msg_file}" = "Image" ]] then - add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "camera_info_manager" - add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "image_transport" - add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "cv_bridge" + add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "camera_info_manager" false + add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "image_transport" false + add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "cv_bridge" false fi ################################################################################ diff --git a/libraries/create_subscriber.sh b/libraries/create_subscriber.sh index 1ebb5aef7baf10bd7e7aa230888632690247a3c4..b01697c96a2b0be3e6751586847f41b9459401fb 100755 --- a/libraries/create_subscriber.sh +++ b/libraries/create_subscriber.sh @@ -401,9 +401,9 @@ function create_subscriber add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "${msg_pkg}" if [[ "${msg_file}" = "Image" ]] then - add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "camera_info_manager" - add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "image_transport" - add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "cv_bridge" + add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "camera_info_manager" false + add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "image_transport" false + add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "cv_bridge" false fi ################################################################################ diff --git a/libraries/create_tf2_broadcaster.sh b/libraries/create_tf2_broadcaster.sh index d8189afc5e0938ec4ead6a2a4090a39bd7d12444..15b7e72afa9f2259341c986e9ba24fa5c882334c 100644 --- a/libraries/create_tf2_broadcaster.sh +++ b/libraries/create_tf2_broadcaster.sh @@ -185,7 +185,7 @@ function create_tf2_broadcaster ################################################################################ # modify the CMakeLists.txt file - add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "tf2_ros" + add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "tf2_ros" false ################################################################################ #compile diff --git a/libraries/create_tf2_listener.sh b/libraries/create_tf2_listener.sh index 33064292975d2e31b6ed17bf9047900ab4db3aab..58ee0f5bd13bf4115407a60c25677c5574dd78ff 100644 --- a/libraries/create_tf2_listener.sh +++ b/libraries/create_tf2_listener.sh @@ -254,7 +254,7 @@ function create_tf2_listener ################################################################################ # modify the CMakeLists.txt file - add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "tf2_ros" + add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "tf2_ros" false ################################################################################ #compile diff --git a/libraries/scripts_library.sh b/libraries/scripts_library.sh index b071e5421b2227af04bf0ccdcef07a1b5e8374ac..5193ba302c9cd41686cf0b1e51a26f0be999cdae 100755 --- a/libraries/scripts_library.sh +++ b/libraries/scripts_library.sh @@ -695,11 +695,13 @@ function add_cmake_dependencies local driver_alg=$1 local ros_pkg=$2 local new_pkg=$3 + local is_msg_pkg=${4:-true} local line="" local old_line="" local comment="" local old_string="" local new_string="" + if [[ "${new_pkg}" != "${ros_pkg}" ]] then @@ -719,9 +721,12 @@ function add_cmake_dependencies sed -i -e "/CATKIN_DEPENDS/ s/${old_string}/${new_string}/g" "CMakeLists.txt" fi - line="add_dependencies(\${PROJECT_NAME} ${new_pkg}_generate_messages_cpp)" - comment="add_dependencies(\${PROJECT_NAME} <msg_package_name>_generate_messages_cpp)" - add_line_to_file "${line}" "${comment}" "CMakeLists.txt" + if [[ "${is_msg_pkg}" == true ]] + then + line="add_dependencies(\${PROJECT_NAME} ${new_pkg}_generate_messages_cpp)" + comment="add_dependencies(\${PROJECT_NAME} <msg_package_name>_generate_messages_cpp)" + add_line_to_file "${line}" "${comment}" "CMakeLists.txt" + fi fi }