[geographiclib] Update to version 1.51 (#14711)

* [geographiclib] Update to version 1.51

This is just a routine upgrade.

* Use git diff to create patch file

* Preserve execute permissions on tools

* Handle installation of tools so that shared libs are found.

Co-authored-by: Charles Karney <charles.karney@sri.com>

3 files changed, 42 insertions, 25 deletions

diff --git a/ports/geographiclib/cxx-library-only.patch b/ports/geographiclib/cxx-library-only.patch
index 88ffc8125..2e3893a97 100644
--- a/ports/geographiclib/cxx-library-only.patch
+++ b/ports/geographiclib/cxx-library-only.patch
@@ -1,8 +1,29 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 30875ddb..34aa6515 100644
+index 345df69b..cb891034 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -464,12 +464,12 @@ endif ()
+@@ -196,6 +196,11 @@ else ()
+   set (DEVELOPER OFF)
+ endif ()
+ 
++set (INSTALL_TOOL_DIR "tools/geographiclib")
++file (RELATIVE_PATH PROJECT_LIB_DIR
++  "${CMAKE_INSTALL_PREFIX}/${INSTALL_TOOL_DIR}"
++  "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
++
+ if (NOT MSVC)
+   # Set the run time path for shared libraries for non-Windows machines.
+   # (1) include link path for external packages (not needed with
+@@ -207,7 +212,7 @@ if (NOT MSVC)
+   # (2) include installed path for GeographicLib.
+   if (NOT APPLE)
+     # Use relative path so that package is relocatable
+-    set (CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}")
++    set (CMAKE_INSTALL_RPATH "\$ORIGIN/${PROJECT_LIB_DIR}")
+   else ()
+     # cmake 2.8.12 introduced a way to make the package relocatable.
+     # See also INSTALL_RPATH property on the tools.
+@@ -434,12 +439,12 @@ endif ()
  # documentation files into the source tree.  Skip Apple here because
  # man/makeusage.sh uses "head --lines -4" to drop the last 4 lines of a
  # file and there's no simple equivalent for MacOSX
@@ -17,7 +38,7 @@ index 30875ddb..34aa6515 100644
    set (MAINTAINER ON)
  else ()
    set (MAINTAINER OFF)
-@@ -496,25 +496,34 @@ if (WIN32)
+@@ -466,25 +471,34 @@ if (WIN32)
    set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
  endif ()
  
@@ -53,7 +74,7 @@ index 30875ddb..34aa6515 100644
    if (GEOGRAPHICLIB_PRECISION EQUAL 2)
      set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib)
 diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 90e773ba..c9a303b0 100644
+index cbc21961..69c923bc 100644
 --- a/cmake/CMakeLists.txt
 +++ b/cmake/CMakeLists.txt
 @@ -33,10 +33,10 @@ configure_file (project-config.cmake.in
@@ -69,7 +90,7 @@ index 90e773ba..c9a303b0 100644
    NAMESPACE ${PROJECT_NAME}::
    FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake")
  
-@@ -44,15 +44,9 @@ export (TARGETS
+@@ -44,13 +44,7 @@ export (TARGETS
  # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
  # path to the root from there.  (Note that the whole install tree can
  # be relocated.)
@@ -77,19 +98,15 @@ index 90e773ba..c9a303b0 100644
 -  # Install under lib${LIB_SUFFIX} so that 32-bit and 64-bit packages
 -  # can be installed on a single machine.
 -  set (INSTALL_CMAKE_DIR "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}")
--  set (PROJECT_ROOT_DIR "../../..")
 -else ()
 -  set (INSTALL_CMAKE_DIR "cmake")
--  set (PROJECT_ROOT_DIR "..")
 -endif ()
-+  set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}")
-+  set (PROJECT_ROOT_DIR "../..")
-+
- # @PROJECT_INCLUDE_DIRS@ is not used in the install tree; reset
- # it to prevent the source and build paths appearing in the installed
- # config files
++set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}")
+ # Find root of install tree relative to INSTALL_CMAKE_DIR
+ file (RELATIVE_PATH PROJECT_ROOT_DIR
+   "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}")
 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index b8c028c7..26e4ba14 100644
+index 3fa8ec6a..92c73946 100644
 --- a/tools/CMakeLists.txt
 +++ b/tools/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -110,12 +127,17 @@ index b8c028c7..26e4ba14 100644
  
    target_link_libraries (${TOOL} ${PROJECT_LIBRARIES} ${HIGHPREC_LIBRARIES})
  
-@@ -35,7 +35,7 @@ if (APPLE)
+@@ -31,11 +31,11 @@ endif ()
+ if (APPLE)
+   # Ensure that the package is relocatable
+   set_target_properties (${TOOLS} PROPERTIES
+-    INSTALL_RPATH "@loader_path/../lib${LIB_SUFFIX}")
++    INSTALL_RPATH "@loader_path/${PROJECT_LIB_DIR}")
  endif ()
  
  # Specify where the tools are installed, adding them to the export targets
 -install (TARGETS ${TOOLS} EXPORT targets DESTINATION bin)
-+install (TARGETS ${TOOLS} DESTINATION tools)
++install (TARGETS ${TOOLS} DESTINATION "${INSTALL_TOOL_DIR}")
  
  if (MSVC AND PACKAGE_DEBUG_LIBS)
    # Possibly don't EXPORT the debug versions of the tools and then this
diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake
index 988aef10b..e948114cd 100644
--- a/ports/geographiclib/portfile.cmake
+++ b/ports/geographiclib/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_from_sourceforge (
     OUT_SOURCE_PATH SOURCE_PATH
     REPO geographiclib
     REF distrib
-    FILENAME "GeographicLib-1.50.1.tar.gz"
-    SHA512 1db874f30957a0edb8a1df3eee6db73cc993629e3005fe912e317a4ba908e7d7580ce483bb0054c4b46370b8edaec989609fb7e4eb6ba00c80182db43db436f1
+    FILENAME "GeographicLib-1.51.tar.gz"
+    SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead
     PATCHES cxx-library-only.patch
 )
 
@@ -38,13 +38,8 @@ vcpkg_install_cmake ()
 vcpkg_fixup_cmake_targets (CONFIG_PATH share/geographiclib)
 vcpkg_copy_pdbs ()
 
-file (GLOB TOOL_LIST LIST_DIRECTORIES false
-  ${CURRENT_PACKAGES_DIR}/tools/*)
-if (TOOL_LIST)
-  file (INSTALL ${TOOL_LIST}
-    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+if (tools IN_LIST FEATURES)
   vcpkg_copy_tool_dependencies (${CURRENT_PACKAGES_DIR}/tools/${PORT})
-  file (REMOVE ${TOOL_LIST})
 endif ()
 
 file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json
index bccf0054f..18deaa771 100644
--- a/ports/geographiclib/vcpkg.json
+++ b/ports/geographiclib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "geographiclib",
-  "version-string": "1.50.1",
+  "version-string": "1.51",
   "description": "GeographicLib, a C++ library for performing geographic conversions",
   "homepage": "https://geographiclib.sourceforge.io",
   "features": {