-
-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add lanelet2 * Create ros-noetic-mrt-cmake-modules.patch * Update ros-noetic-mrt-cmake-modules.patch Thanks @traversaro!
- Loading branch information
1 parent
9723e60
commit 2101d84
Showing
2 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From b27f1a064037e04dc98512f7ffcbfe54905130fa Mon Sep 17 00:00:00 2001 | ||
From: Silvio Traversaro <[email protected]> | ||
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters