diff options
| author | Charles Karney <charles@karney.com> | 2020-07-14 11:44:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 08:44:21 -0700 |
| commit | e55460813578f6a8633bbf76ef96e10c1fa22382 (patch) | |
| tree | cebd41de72ed1995381be03f4b172d71543e8f6c /ports/geographiclib/remove-tools-and-fix-version.patch | |
| parent | 8e3c3042698066a7336bc26f8c88391bcaddefb2 (diff) | |
| download | vcpkg-e55460813578f6a8633bbf76ef96e10c1fa22382.tar.gz vcpkg-e55460813578f6a8633bbf76ef96e10c1fa22382.zip | |
[geographiclib] Update to 1.50.1 (#12379)
* Upgrade geographiclib to version 1.50.1
* Tinker with sourceforge download
* Strip verbiage at top of geographiclib/portfile.cmake
* geographiclib: fix for windows build
* geographiclib: minimize size of patch file
* add missing manifest
* A stab at fixing uwp build error. But I'm working in the dark!
* Back out of previous commit. It didn't help.
* Call cmake_minimum_required first
* geographiclib: remove tools from build -- incompatible with uwp
* geographiclib: remove stray reference to TOOLS
* geographiclib: try installing executables into tools
* geographiclib: Do not build tools for uwp
* geographiclib: fix up build of tools
* geographiclib: Minor clean up
* geographiclib: handle uwp vs tools more elegantly
* geographiclib: reformation vcpkg,json
* geographiclib: don't build tools by default
* geographiclib: Don't register the tools as targets; this causes problems if they are moved
Co-authored-by: Charles Karney <charles.karney@sri.com>
Diffstat (limited to 'ports/geographiclib/remove-tools-and-fix-version.patch')
| -rw-r--r-- | ports/geographiclib/remove-tools-and-fix-version.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/ports/geographiclib/remove-tools-and-fix-version.patch b/ports/geographiclib/remove-tools-and-fix-version.patch deleted file mode 100644 index d4f94e02c..000000000 --- a/ports/geographiclib/remove-tools-and-fix-version.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e79923b..3448362 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -437,13 +437,13 @@ 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) --add_subdirectory (js) --add_subdirectory (matlab) --add_subdirectory (python/geographiclib) --add_subdirectory (examples) -+# add_subdirectory (tools) -+# add_subdirectory (man) -+# add_subdirectory (doc) -+# add_subdirectory (js) -+# add_subdirectory (matlab) -+# add_subdirectory (python/geographiclib) -+# add_subdirectory (examples) - if (MSVC AND BUILD_NETGEOGRAPHICLIB) - if (GEOGRAPHICLIB_PRECISION EQUAL 2) - set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 0c8ad64..7dc4096 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -14,10 +14,10 @@ configure_file (project-config.cmake.in - 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} ${TOOLS} -+ ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} - FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake") - export (TARGETS -- ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} ${TOOLS} -+ ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} - NAMESPACE ${PROJECT_NAME}:: - FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake") - -diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in -index 3b3b9e8..bc2ce19 100644 ---- a/cmake/project-config-version.cmake.in -+++ b/cmake/project-config-version.cmake.in -@@ -18,10 +18,10 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR - # since a multi-architecture library is built for that platform). - set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@") - set (PACKAGE_VERSION_UNSUITABLE TRUE) --elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@") -+#elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@") - # Reject if there's a mismatch in MSVC compiler versions -- set (REASON "_MSC_VER = @MSVC_VERSION@") -- set (PACKAGE_VERSION_UNSUITABLE TRUE) -+# set (REASON "_MSC_VER = @MSVC_VERSION@") -+# set (PACKAGE_VERSION_UNSUITABLE TRUE) - elseif (NOT CMAKE_CROSSCOMPILING STREQUAL "@CMAKE_CROSSCOMPILING@") - # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} - set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") |
