Skip to content

Commit 5e18255

Browse files
Merge pull request #370 from TayebAlsh/add-mavros-linux64-patch
Add linux-64 patch for mavros GeographicLib CONFIG mode
2 parents e73db40 + 1c91c5c commit 5e18255

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 00e5f70fc..3a8b2e1d5 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -36,10 +36,9 @@ find_package(Eigen3 REQUIRED)
6+
7+
## Find GeographicLib
8+
-# Append to CMAKE_MODULE_PATH since debian/ubuntu installs
9+
-# FindGeographicLib.cmake in a nonstand location
10+
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};/usr/share/cmake/geographiclib")
11+
-find_package(GeographicLib REQUIRED)
12+
+# Use CONFIG mode to find GeographicLib from conda package
13+
+# (libmavconn already sets CMAKE_MODULE_PATH for CheckGeographicLibDatasets)
14+
+find_package(GeographicLib REQUIRED CONFIG)
15+
16+
find_package(angles REQUIRED)
17+
find_package(eigen_stl_containers REQUIRED)

pkg_additional_info.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,5 @@ rosidl_generator_cpp:
151151
build_number: 14
152152
rosidl_runtime_cpp:
153153
build_number: 14
154+
mavros:
155+
build_number: 14

0 commit comments

Comments
 (0)