From db1fafe0fd6db9b479fa00c367e6a351fc19307e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rik=20B=C3=A4hnemann?= Date: Mon, 11 Jan 2021 10:48:28 +0100 Subject: [PATCH 1/3] Add catkin_simple dependency. --- install/mav_trajectory_generation_https.rosinstall | 1 + install/mav_trajectory_generation_ssh.rosinstall | 1 + 2 files changed, 2 insertions(+) diff --git a/install/mav_trajectory_generation_https.rosinstall b/install/mav_trajectory_generation_https.rosinstall index c6cd1152..6a7b398a 100644 --- a/install/mav_trajectory_generation_https.rosinstall +++ b/install/mav_trajectory_generation_https.rosinstall @@ -1,3 +1,4 @@ +- git: {local-name: catkin_simple, uri: 'https://github.com/catkin/catkin_simple.git'} - git: {local-name: eigen_catkin, uri: 'https://github.com/ethz-asl/eigen_catkin.git'} - git: {local-name: eigen_checks, uri: 'https://github.com/ethz-asl/eigen_checks.git'} - git: {local-name: glog_catkin, uri: 'https://github.com/ethz-asl/glog_catkin.git'} diff --git a/install/mav_trajectory_generation_ssh.rosinstall b/install/mav_trajectory_generation_ssh.rosinstall index 8198b65a..5e6a97d0 100644 --- a/install/mav_trajectory_generation_ssh.rosinstall +++ b/install/mav_trajectory_generation_ssh.rosinstall @@ -1,3 +1,4 @@ +- git: {local-name: catkin_simple, uri: 'git@github.com:catkin/catkin_simple.git'} - git: {local-name: eigen_catkin, uri: 'git@github.com:ethz-asl/eigen_catkin.git'} - git: {local-name: eigen_checks, uri: 'git@github.com:ethz-asl/eigen_checks.git'} - git: {local-name: glog_catkin, uri: 'git@github.com:ethz-asl/glog_catkin.git'} From 0941351c731ce8088ff9d8e01a7009a85775917e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rik=20B=C3=A4hnemann?= Date: Mon, 11 Jan 2021 11:37:27 +0100 Subject: [PATCH 2/3] Make yaml_cpp_catkin optional. --- mav_trajectory_generation/package.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mav_trajectory_generation/package.xml b/mav_trajectory_generation/package.xml index 320d7314..77126715 100644 --- a/mav_trajectory_generation/package.xml +++ b/mav_trajectory_generation/package.xml @@ -19,9 +19,10 @@ cmake_modules eigen_catkin - yaml_cpp_catkin eigen_checks glog_catkin mav_msgs nlopt + + yaml_cpp_catkin From 7eff911e72e5505f560e0e946a71afa37df3c2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rik=20B=C3=A4hnemann?= Date: Mon, 11 Jan 2021 11:40:13 +0100 Subject: [PATCH 3/3] Update readme. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 04c0e552..a011e439 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,9 @@ Michael Burri, Helen Oleynikova, Markus Achtelik, and Roland Siegwart, “**Real ## Installation Instructions (Ubuntu) To install this package with [ROS Indigo](http://wiki.ros.org/indigo/Installation/Ubuntu) or [ROS Kinetic](http://wiki.ros.org/kinetic/Installation/Ubuntu): -1. Install additional system dependencies (swap indigo for kinetic as necessary): +1. Install additional system dependencies (swap indigo for kinetic or melodic as necessary): + +** Note: ROS melodic requires libyaml-cpp-dev and does not build with yaml_cpp_catkin in your catkin workspace! ``` sudo apt-get install python-wstool python-catkin-tools ros-indigo-cmake-modules libyaml-cpp-dev @@ -64,7 +66,7 @@ wstool update wstool merge mav_trajectory_generation/install/mav_trajectory_generation_https.rosinstall wstool update -j8 echo "source ~/catkin_ws/devel/setup.bash" >> ~/.bashrc -source ~/.bashrc +source /opt/ros/indigo/setup.bash ``` In case you have your SSH keys for github set up, feel free to use the ssh rosinstall instead: