Skip to content

Commit 2101d84

Browse files
Add lanelet2 (#468)
* Add lanelet2 * Create ros-noetic-mrt-cmake-modules.patch * Update ros-noetic-mrt-cmake-modules.patch Thanks @traversaro!
1 parent 9723e60 commit 2101d84

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From b27f1a064037e04dc98512f7ffcbfe54905130fa Mon Sep 17 00:00:00 2001
2+
From: Silvio Traversaro <[email protected]>
3+
Date: Sat, 20 Apr 2024 14:48:36 +0200
4+
Subject: [PATCH] FindGeographicLib: Fix for GeographicLib 2.* and Windows
5+
6+
Since GeographicLib version 2, the library name changed from `libGeographic.so` to `libGeographicLib.so`, see https://github.com/geographiclib/geographiclib/blob/5e4425da84a46eb70e59656d71b4c99732a570ec/NEWS#L208 .
7+
8+
To ensure that GeographicLib 2.* is found correcty, I think we should add also `GeographicLib` to the names used by `find_library`.
9+
10+
Furthermore, on Windows the import library is called `GeographicLib-i.lib` (see https://github.com/geographiclib/geographiclib/blob/v2.3/src/CMakeLists.txt#L119), so to find the library correctly on Windows we also look for GeographicLib-i .
11+
---
12+
cmake/Modules/FindGeographicLib.cmake | 2 +-
13+
1 file changed, 1 insertion(+), 1 deletion(-)
14+
15+
diff --git a/cmake/Modules/FindGeographicLib.cmake b/cmake/Modules/FindGeographicLib.cmake
16+
index 63dfe30..a5598d5 100644
17+
--- a/cmake/Modules/FindGeographicLib.cmake
18+
+++ b/cmake/Modules/FindGeographicLib.cmake
19+
@@ -10,7 +10,7 @@ find_package(PkgConfig)
20+
find_path(GeographicLib_INCLUDE_DIR GeographicLib/Config.h PATH_SUFFIXES GeographicLib)
21+
set(GeographicLib_INCLUDE_DIRS ${GeographicLib_INCLUDE_DIR})
22+
23+
-find_library(GeographicLib_LIBRARIES NAMES Geographic)
24+
+find_library(GeographicLib_LIBRARIES NAMES Geographic GeographicLib GeographicLib-i)
25+
26+
include(FindPackageHandleStandardArgs)
27+
find_package_handle_standard_args(GeographicLib DEFAULT_MSG GeographicLib_LIBRARIES GeographicLib_INCLUDE_DIRS)

vinca_linux_64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ packages_select_by_deps:
227227
- rosfmt
228228
- rosmon
229229
- husky-simulator
230+
- lanelet2
230231

231232
- ros-ign
232233
- ros-ign-bridge

0 commit comments

Comments
 (0)