[geographiclib]Fix install files path.

ports/geographiclib/CONTROL

@@ -1,3 +1,3 @@
 Source: geographiclib
-Version: 1.47-patch1-4
+Version: 1.47-patch1-5
 Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems.

ports/geographiclib/fix-install-path.patch

@@ -0,0 +1,113 @@
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 200043d..e3ed546 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -15,11 +15,11 @@ configure_file (project-config-version.cmake.in
+   "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY)
+ export (TARGETS
+   ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES}
+-  FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake")
++  FILE "share/${PROJECT_NAME_LOWER}/${PROJECT_NAME_LOWER}-targets.cmake")
+ export (TARGETS
+   ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES}
+   NAMESPACE ${PROJECT_NAME}::
+-  FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake")
++  FILE "share/${PROJECT_NAME_LOWER}/${PROJECT_NAME_LOWER}-namespace-targets.cmake")
+ 
+ # geographiclib-config.cmake for the install tree.  It's installed in
+ # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
+@@ -43,26 +43,26 @@ configure_file (project-config-version.cmake.in
+   project-config-version.cmake @ONLY)
+ install (FILES
+   "${CMAKE_CURRENT_BINARY_DIR}/project-config.cmake"
+-  DESTINATION "${INSTALL_CMAKE_DIR}"
++  DESTINATION share/${PROJECT_NAME_LOWER}
+   RENAME "${PROJECT_NAME_LOWER}-config.cmake")
+ install (FILES
+   "${CMAKE_CURRENT_BINARY_DIR}/project-config-version.cmake"
+-  DESTINATION "${INSTALL_CMAKE_DIR}"
++  DESTINATION share/${PROJECT_NAME_LOWER}
+   RENAME "${PROJECT_NAME_LOWER}-config-version.cmake")
+ # Make information about the cmake targets (the library and the tools)
+ # available.
+ install (EXPORT targets
+   FILE ${PROJECT_NAME_LOWER}-targets.cmake
+-  DESTINATION "${INSTALL_CMAKE_DIR}")
++  DESTINATION share/${PROJECT_NAME_LOWER})
+ install (EXPORT targets
+   NAMESPACE ${PROJECT_NAME}::
+   FILE ${PROJECT_NAME_LOWER}-namespace-targets.cmake
+-  DESTINATION "${INSTALL_CMAKE_DIR}")
++  DESTINATION share/${PROJECT_NAME_LOWER})
+ 
+ if (MSVC AND PACKAGE_DEBUG_LIBS)
+   install (FILES
+     "${PROJECT_BINARY_DIR}/cmake/CMakeFiles/Export/cmake/${PROJECT_NAME_LOWER}-targets-debug.cmake"
+-    DESTINATION "${INSTALL_CMAKE_DIR}" CONFIGURATIONS Release)
++    DESTINATION share/${PROJECT_NAME_LOWER} CONFIGURATIONS Release)
+ endif ()
+ 
+ # Support for pkgconfig/geographiclib.pc
+@@ -77,4 +77,4 @@ set (PACKAGE_VERSION "${PROJECT_VERSION}")
+ configure_file (project.pc.in geographiclib.pc @ONLY)
+ install (FILES
+   "${CMAKE_CURRENT_BINARY_DIR}/geographiclib.pc"
+-  DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
++  DESTINATION "share/${PROJECT_NAME_LOWER}/pkgconfig")
+diff --git a/include/GeographicLib/CMakeLists.txt b/include/GeographicLib/CMakeLists.txt
+index 892f3d0..3c234fc 100644
+--- a/include/GeographicLib/CMakeLists.txt
++++ b/include/GeographicLib/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # Install the header files including the generated Config.h (which is in
+ # the build tree).
+ file (GLOB HEADERS [A-Za-z]*.hpp)
+-install (FILES ${HEADERS} DESTINATION include/GeographicLib)
++install (FILES ${HEADERS} DESTINATION include/geographicLib)
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Config.h
+-  DESTINATION include/GeographicLib)
++  DESTINATION include/geographicLib)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 33e7993..890a471 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -77,14 +77,14 @@ install (TARGETS ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES}
+   # versions of cmake (2.8.12 and later?).  So comment out for now.
+   # INCLUDES DESTINATION include
+   RUNTIME DESTINATION bin
+-  LIBRARY DESTINATION lib${LIB_SUFFIX}
+-  ARCHIVE DESTINATION lib${LIB_SUFFIX})
++  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib)
+ 
+ if (MSVC AND PACKAGE_DEBUG_LIBS)
+   if (GEOGRAPHICLIB_SHARED_LIB)
+     install (FILES
+       "${PROJECT_BINARY_DIR}/lib/Debug/${LIBNAME}${CMAKE_DEBUG_POSTFIX}-i.lib"
+-      DESTINATION lib${LIB_SUFFIX} CONFIGURATIONS Release)
++      DESTINATION lib CONFIGURATIONS Release)
+     install (PROGRAMS
+       "${PROJECT_BINARY_DIR}/bin/Debug/${LIBNAME}${CMAKE_DEBUG_POSTFIX}.dll"
+       DESTINATION bin CONFIGURATIONS Release)
+@@ -92,7 +92,7 @@ if (MSVC AND PACKAGE_DEBUG_LIBS)
+   if (GEOGRAPHICLIB_STATIC_LIB)
+     install (FILES
+       "${PROJECT_BINARY_DIR}/lib/Debug/${LIBNAME}${CMAKE_DEBUG_POSTFIX}.lib"
+-      DESTINATION lib${LIB_SUFFIX} CONFIGURATIONS Release)
++      DESTINATION lib CONFIGURATIONS Release)
+   endif ()
+ endif ()
+ 
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index b56c9e0..b331dea 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -51,7 +51,7 @@ if (NOT WIN32)
+       COMMAND ${CMAKE_COMMAND} -E
+         copy scripts/${SCRIPT} ${SCRIPT} && chmod +x ${SCRIPT}
+       DEPENDS ${SCRIPT}.sh)
+-    install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT} DESTINATION sbin)
++    install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT} DESTINATION tools/${PROJECT_NAME_LOWER}/scripts)
+   endforeach ()
+   add_custom_target (scripts ALL DEPENDS ${SCRIPTS})
+ endif ()

ports/geographiclib/portfile.cmake

@@ -11,16 +11,18 @@
 #
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geographiclib-1.47)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "https://jaist.dl.sourceforge.net/project/geographiclib/distrib/GeographicLib-1.47-patch1.zip"
     FILENAME "geographiclib-1.47-patch1.zip"
     SHA512 d8fdfd7ae093057ec1a4ab922457fe71a3fb9975df5b673c276d62a0e9c4f212dc63652830b9d89e3890bc96aafd335992943cf6a1bce8260acf932d1eb7abfd
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
-vcpkg_apply_patches(
+    OUT_SOURCE_PATH SOURCE_PATH
-    SOURCE_PATH ${SOURCE_PATH}
+    ARCHIVE ${ARCHIVE}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove-tools-and-fix-version.patch"
+    PATCHES
+           remove-tools-and-fix-version.patch
+           fix-install-path.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -44,39 +46,13 @@ else()
 endif()
 
 vcpkg_install_cmake()
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
+vcpkg_copy_pdbs()
-file(GLOB GEOGRAPHICLIB_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/cmake/*.cmake ${CURRENT_PACKAGES_DIR}/debug/cmake/*.cmake)
-file(COPY ${GEOGRAPHICLIB_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib)
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-targets.cmake GEOGRAPHICLIB_MODULE)
+file(COPY ${CURRENT_PACKAGES_DIR}/debug/share/geographiclib/geographiclib-namespace-targets-debug.cmake
-string(REPLACE "\${_IMPORT_PREFIX}/include" "\${_IMPORT_PREFIX}/../include" GEOGRAPHICLIB_MODULE "${GEOGRAPHICLIB_MODULE}")
+          ${CURRENT_PACKAGES_DIR}/debug/share/geographiclib/geographiclib-targets-debug.cmake
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets.cmake "${GEOGRAPHICLIB_MODULE}")
+          DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib)
-
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-targets-debug.cmake GEOGRAPHICLIB_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/../debug" GEOGRAPHICLIB_DEBUG_MODULE "${GEOGRAPHICLIB_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets-debug.cmake "${GEOGRAPHICLIB_DEBUG_MODULE}")
-
-file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-namespace-targets-debug.cmake GEOGRAPHICLIB_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/../debug" GEOGRAPHICLIB_DEBUG_MODULE "${GEOGRAPHICLIB_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-namespace-targets-debug.cmake "${GEOGRAPHICLIB_DEBUG_MODULE}")
-
-
-file(READ ${CURRENT_PACKAGES_DIR}/cmake/geographiclib-targets-release.cmake GEOGRAPHICLIB_RELEASE_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/.." GEOGRAPHICLIB_RELEASE_MODULE "${GEOGRAPHICLIB_RELEASE_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets-release.cmake "${GEOGRAPHICLIB_RELEASE_MODULE}")
-
-file(READ ${CURRENT_PACKAGES_DIR}/cmake/geographiclib-namespace-targets-release.cmake GEOGRAPHICLIB_RELEASE_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/.." GEOGRAPHICLIB_RELEASE_MODULE "${GEOGRAPHICLIB_RELEASE_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-namespace-targets-release.cmake "${GEOGRAPHICLIB_RELEASE_MODULE}")
-
-
-file(COPY ${CURRENT_BUILDTREES_DIR}/src/GeographicLib-1.47/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/geographiclib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/geographiclib/copyright)
-
-file(GLOB EXE_FILES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-# file(REMOVE_RECURSE ${EXE_FILES})
+
+file(INSTALL ${SOURCE_PATH}/00README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib RENAME readme)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib RENAME copyright)