lib: simplify geolib cmake module, try to fix CI

libmavconn/cmake/Modules/FindGeographicLib.cmake

@@ -1,49 +1,18 @@
-##
 # Look for GeographicLib
-# Modified version from the original so it can work for Debian-alike systems
-# and find the proper shared library.
 #
-# Set:
-#  GeographicLib_FOUND = GEOGRAPHICLIB_FOUND = TRUE
-#  GeographicLib_INCLUDE_DIRS = /usr/local/include  or
-#                               /usr/include
-#  GeographicLib_LIBRARIES = /usr/local/lib/libGeographic.so  or
-#                            /usr/lib/x86_64-linux-gnu/libGeographic.so
-#  GeographicLib_LIBRARY_DIRS = /usr/local/lib  or
-#                               /usr/lib/x86_64-linux-gnu/ for Debian systems
-##
+# Set
+#  GEOGRAPHICLIB_FOUND = TRUE
+#  GeographicLib_INCLUDE_DIRS = /usr/local/include
+#  GeographicLib_LIBRARIES = /usr/local/lib/libGeographic.so
+#  GeographicLib_LIBRARY_DIRS = /usr/local/lib
 
-find_library (GeographicLib_LIBRARIES Geographic
-  PATHS "${CMAKE_INSTALL_PREFIX}/../GeographicLib/lib")
+find_path (GeographicLib_INCLUDE_DIRS NAMES GeographicLib/Config.h)
 
-if (GeographicLib_LIBRARIES)
-  get_filename_component (GeographicLib_LIBRARY_DIRS
-    "${GeographicLib_LIBRARIES}" PATH)
-
-  get_filename_component (_ROOT_DIR "${GeographicLib_LIBRARY_DIRS}" PATH)
-  set (GeographicLib_INCLUDE_DIRS "${_ROOT_DIR}/../include")
-  set (GeographicLib_BINARY_DIRS "${_ROOT_DIR}/../bin")
-
-  # Required for Debian-alike systems
-  find_library (GeographicLib_LIBRARIES_DEBIAN libGeographic.so
-    PATHS "/usr/lib/x86_64-linux-gnu")
-  if (GeographicLib_LIBRARIES_DEBIAN)
-    set (GeographicLib_LIBRARIES ${GeographicLib_LIBRARIES_DEBIAN})
-    get_filename_component (GeographicLib_LIBRARY_DIRS
-      "${GeographicLib_LIBRARIES}" PATH)
-  endif ()
-
-  if (NOT EXISTS "${GeographicLib_INCLUDE_DIRS}/GeographicLib/Config.h")
-    unset (GeographicLib_INCLUDE_DIRS)
-    unset (GeographicLib_LIBRARIES)
-    unset (GeographicLib_LIBRARY_DIRS)
-    unset (GeographicLib_BINARY_DIRS)
-  endif ()
-  unset (_ROOT_DIR)
-endif ()
+find_library (GeographicLib_LIBRARIES NAMES Geographic)
 
 include (FindPackageHandleStandardArgs)
 find_package_handle_standard_args (GeographicLib DEFAULT_MSG
-  GeographicLib_LIBRARY_DIRS GeographicLib_LIBRARIES GeographicLib_INCLUDE_DIRS)
-mark_as_advanced (GeographicLib_LIBRARY_DIRS GeographicLib_LIBRARIES
-  GeographicLib_INCLUDE_DIRS)
+  GeographicLib_LIBRARIES GeographicLib_INCLUDE_DIRS)
+mark_as_advanced (GeographicLib_LIBRARIES GeographicLib_INCLUDE_DIRS)
+
+message(WARNING "GL: F:${GeographicLib_FOUND} L:${GeographicLib_LIBRARIES} I:${GeographicLib_INCLUDE_DIRS}")

mavros/CMakeLists.txt

@@ -38,7 +38,7 @@ if(NOT EIGEN3_FOUND)
 endif()
 
 ## Find GeographicLib
-find_package(GeographicLib)
+find_package(GeographicLib REQUIRED)
 
 ## Check if the datasets are installed
 include(CheckGeographicLibDatasets)