From 2101d8416dc78b4beecce6016989a48d3d453a73 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 21 Apr 2024 09:19:28 +1000 Subject: [PATCH] Add lanelet2 (#468) * Add lanelet2 * Create ros-noetic-mrt-cmake-modules.patch * Update ros-noetic-mrt-cmake-modules.patch Thanks @traversaro! --- patch/ros-noetic-mrt-cmake-modules.patch | 27 ++++++++++++++++++++++++ vinca_linux_64.yaml | 1 + 2 files changed, 28 insertions(+) create mode 100644 patch/ros-noetic-mrt-cmake-modules.patch diff --git a/patch/ros-noetic-mrt-cmake-modules.patch b/patch/ros-noetic-mrt-cmake-modules.patch new file mode 100644 index 000000000..c56406a0a --- /dev/null +++ b/patch/ros-noetic-mrt-cmake-modules.patch @@ -0,0 +1,27 @@ +From b27f1a064037e04dc98512f7ffcbfe54905130fa Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Sat, 20 Apr 2024 14:48:36 +0200 +Subject: [PATCH] FindGeographicLib: Fix for GeographicLib 2.* and Windows + +Since GeographicLib version 2, the library name changed from `libGeographic.so` to `libGeographicLib.so`, see https://github.com/geographiclib/geographiclib/blob/5e4425da84a46eb70e59656d71b4c99732a570ec/NEWS#L208 . + +To ensure that GeographicLib 2.* is found correcty, I think we should add also `GeographicLib` to the names used by `find_library`. + +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 . +--- + cmake/Modules/FindGeographicLib.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/Modules/FindGeographicLib.cmake b/cmake/Modules/FindGeographicLib.cmake +index 63dfe30..a5598d5 100644 +--- a/cmake/Modules/FindGeographicLib.cmake ++++ b/cmake/Modules/FindGeographicLib.cmake +@@ -10,7 +10,7 @@ find_package(PkgConfig) + find_path(GeographicLib_INCLUDE_DIR GeographicLib/Config.h PATH_SUFFIXES GeographicLib) + set(GeographicLib_INCLUDE_DIRS ${GeographicLib_INCLUDE_DIR}) + +-find_library(GeographicLib_LIBRARIES NAMES Geographic) ++find_library(GeographicLib_LIBRARIES NAMES Geographic GeographicLib GeographicLib-i) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(GeographicLib DEFAULT_MSG GeographicLib_LIBRARIES GeographicLib_INCLUDE_DIRS) diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml index 4c61fd608..f7b6ea218 100644 --- a/vinca_linux_64.yaml +++ b/vinca_linux_64.yaml @@ -227,6 +227,7 @@ packages_select_by_deps: - rosfmt - rosmon - husky-simulator + - lanelet2 - ros-ign - ros-ign-bridge