Skip to content
Snippets Groups Projects
Commit 36bc575b authored by Fernando Herrero's avatar Fernando Herrero
Browse files

Add argument to add_cmake_dependencies function, to disable adding CMakeLists...

Add argument to add_cmake_dependencies function, to disable adding CMakeLists dependency to non existing target *_generate_messages_cpp when package does not contain messages. For example, tf2_ros, and Image packages (cv_bridge, camera_info_manager, image_transport)
parent d9219250
No related branches found
No related tags found
No related merge requests found
......@@ -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
################################################################################
......
......@@ -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
################################################################################
......
......@@ -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
......
......@@ -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
......
......@@ -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
}
......
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