diff --git a/recipes-ros/mavros/mavros/0001-CMake-explicitly-link-the-atomic-library-797.patch b/recipes-ros/mavros/mavros/0001-CMake-explicitly-link-the-atomic-library-797.patch index 780ad41..4169d32 100644 --- a/recipes-ros/mavros/mavros/0001-CMake-explicitly-link-the-atomic-library-797.patch +++ b/recipes-ros/mavros/mavros/0001-CMake-explicitly-link-the-atomic-library-797.patch @@ -1,4 +1,4 @@ -From 658347978fc97675dbdff480f4557eb772e915dc Mon Sep 17 00:00:00 2001 +From 06d862fcf3bdcd50fe726e5364200cc5e7b87fcd Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 4 Sep 2017 16:17:12 +0100 Subject: [PATCH] CMake: explicitly link the atomic library (#797) @@ -35,22 +35,20 @@ This patch has been generated with: in the mavros repository. Signed-off-by: Lukas Bulwahn + --- mavros/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/mavros/CMakeLists.txt b/mavros/CMakeLists.txt -index a4ac3cb..5233e96 100644 +index 47a24a9..a0bec5d 100644 --- a/mavros/CMakeLists.txt +++ b/mavros/CMakeLists.txt -@@ -102,6 +102,7 @@ add_library(mavros +@@ -90,6 +90,7 @@ add_library(mavros src/lib/rosconsole_bridge.cpp ) target_link_libraries(mavros + atomic ${catkin_LIBRARIES} ${Boost_LIBRARIES} - ${GeographicLib_LIBRARIES} --- -1.9.1 - + ) diff --git a/recipes-ros/mavros/mavros/0001-always-find-Eigen-with-cmake_modules-mechanism.patch b/recipes-ros/mavros/mavros/0001-always-find-Eigen-with-cmake_modules-mechanism.patch index 16ff831..494ed49 100644 --- a/recipes-ros/mavros/mavros/0001-always-find-Eigen-with-cmake_modules-mechanism.patch +++ b/recipes-ros/mavros/mavros/0001-always-find-Eigen-with-cmake_modules-mechanism.patch @@ -1,15 +1,16 @@ -From d7b00940cb69d659d77bb08b1cbbf5aad4ea4617 Mon Sep 17 00:00:00 2001 +From 800775cf398c51db878524755fde3c29490f2f5d Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 7 May 2017 06:14:18 +0200 Subject: [PATCH] always find Eigen with cmake_modules mechanism Upstream-Status: Pending + --- mavros/CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mavros/CMakeLists.txt b/mavros/CMakeLists.txt -index 3b3a0bd..bcc7924 100644 +index 9c33dff..47a24a9 100644 --- a/mavros/CMakeLists.txt +++ b/mavros/CMakeLists.txt @@ -26,14 +26,10 @@ find_package(catkin REQUIRED COMPONENTS @@ -31,6 +32,3 @@ index 3b3a0bd..bcc7924 100644 include(EnableCXX11) include(MavrosMavlink) --- -1.9.1 -