CMake: Remove GeoGraphicLib Targets

Author: HTRamsey

Diff for: src/AnalyzeView/CMakeLists.txt

@@ -94,11 +94,18 @@ if(TARGET ulog_cpp::ulog_cpp)
     target_link_libraries(QGC PRIVATE ulog_cpp::ulog_cpp)
 endif()
 
+#===========================================================================#
+
+set(EXPAT_EXTRA_OPTIONS)
+if(WIN32)
+    list(APPEND EXPAT_EXTRA_OPTIONS "EXPAT_MSVC_STATIC_CRT ON")
+endif()
+
 CPMAddPackage(
     NAME EXPAT
-    VERSION 2.6.4
+    VERSION 2.7.0
     GITHUB_REPOSITORY libexpat/libexpat
-    GIT_TAG "R_2_6_4"
+    GIT_TAG "R_2_7_0"
     SOURCE_SUBDIR expat
     OPTIONS
         "EXPAT_BUILD_DOCS OFF"
@@ -109,23 +116,28 @@ CPMAddPackage(
         "EXPAT_BUILD_TOOLS OFF"
         "EXPAT_ENABLE_INSTALL OFF"
         "EXPAT_SHARED_LIBS OFF"
+        "${EXPAT_EXTRA_OPTIONS}"
 )
 
 set(_EXIV2_ENABLE_XMP OFF)
 if(EXPAT_ADDED)
-    find_package(expat CONFIG QUIET)
-    if(NOT TARGET expat::expat)
-        find_package(EXPAT MODULE)
-        if(EXPAT_FOUND)
-            if(NOT TARGET expat::expat)
-                add_library(expat::expat INTERFACE IMPORTED)
-                target_link_libraries(expat::expat INTERFACE EXPAT::EXPAT)
-            endif()
-            set(_EXIV2_ENABLE_XMP ON)
+    set(EXPAT_USE_STATIC_LIBS ON)
+    find_package(EXPAT MODULE)
+    if(NOT TARGET EXPAT::EXPAT)
+        find_package(expat CONFIG)
+        if(TARGET expat::expat)
+            add_library(EXPAT::EXPAT INTERFACE IMPORTED)
+            target_link_libraries(EXPAT::EXPAT INTERFACE expat::expat)
         endif()
     endif()
+
+    if(TARGET EXPAT::EXPAT)
+        set(_EXIV2_ENABLE_XMP ON)
+    endif()
 endif()
 
+#===========================================================================#
+
 CPMAddPackage(
     NAME exiv2
     VERSION 0.28.5
@@ -154,6 +166,9 @@ CPMAddPackage(
 )
 
 if(TARGET Exiv2::exiv2lib)
+    if(_EXIV2_ENABLE_XMP AND TARGET exiv2-xmp)
+        target_link_libraries(exiv2-xmp PRIVATE EXPAT::EXPAT)
+    endif()
     target_link_libraries(QGC PRIVATE Exiv2::exiv2lib)
     target_include_directories(QGC PRIVATE ${CMAKE_BINARY_DIR})
 endif()

Diff for: src/Utilities/Geo/CMakeLists.txt

@@ -21,14 +21,6 @@ if(LINUX AND EXISTS "/usr/share/cmake/geographiclib")
 endif()
 
 include(CPM)
-# CPMAddPackage(
-#     NAME geographiclib
-#     VERSION 2.5
-#     URL https://sourceforge.net/projects/geographiclib/files/distrib-C%2B%2B/GeographicLib-2.5.tar.gz/download
-#     DOWNLOAD_ONLY
-#     SOURCE_SUBDIR src
-# )
-
 CPMAddPackage(
     NAME geographiclib
     VERSION 2.5
@@ -50,6 +42,7 @@ CPMAddPackage(
         "PKGDIR OFF"
         "DOCDIR OFF"
         "EXAMPLEDIR OFF"
+    PATCH_COMMAND "git apply ${CMAKE_CURRENT_SOURCE_DIR}/geographiclib.patch"
 )
 
 if(TARGET GeographicLib::GeographicLib)

Diff for: src/Utilities/Geo/geographiclib.patch

@@ -0,0 +1,55 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40d0b206..738d6c83 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -452,32 +452,32 @@ if (WIN32)
+ endif ()
+ 
+ # The list of tools (to be installed into, e.g., /usr/local/bin)
+-set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve
+-  GeoidEval Gravity IntersectTool MagneticField Planimeter RhumbSolve
+-  TransverseMercatorProj)
++# set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve
++#   GeoidEval Gravity IntersectTool MagneticField Planimeter RhumbSolve
++#   TransverseMercatorProj)
+ # The list of scripts (to be installed into, e.g., /usr/local/sbin)
+-set (SCRIPTS geographiclib-get-geoids geographiclib-get-gravity
+-  geographiclib-get-magnetic)
++# set (SCRIPTS geographiclib-get-geoids geographiclib-get-gravity
++#   geographiclib-get-magnetic)
+ 
+ set_property (GLOBAL PROPERTY USE_FOLDERS ON)
+ 
+ # The list of subdirectories to process
+ add_subdirectory (src)
+ add_subdirectory (include/GeographicLib)
+-add_subdirectory (tools)
+-add_subdirectory (man)
+-add_subdirectory (doc)
+-if (EXAMPLEDIR)
+-  set (CALLED_FROM_TOPLEVEL ON)
+-  add_subdirectory (examples)   # This just installs the examples
+-endif ()
++# add_subdirectory (tools)
++# add_subdirectory (man)
++# add_subdirectory (doc)
++# if (EXAMPLEDIR)
++#   set (CALLED_FROM_TOPLEVEL ON)
++#   add_subdirectory (examples)   # This just installs the examples
++# endif ()
+ add_subdirectory (cmake)
+-enable_testing ()
+-add_subdirectory (tests)
+-add_subdirectory (experimental)
+-if (NOT RELEASE)
+-  add_subdirectory (develop)
+-endif ()
++# enable_testing ()
++# add_subdirectory (tests)
++# add_subdirectory (experimental)
++# if (NOT RELEASE)
++#   add_subdirectory (develop)
++# endif ()
+ 
+ # make exampleprograms does a fresh cmake configuration and so uses
+ # find_package to find the just-built version of GeographicLib (via the