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/fix-usage.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/fix-usage.patch')
| -rw-r--r-- | ports/geographiclib/fix-usage.patch | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ports/geographiclib/fix-usage.patch b/ports/geographiclib/fix-usage.patch deleted file mode 100644 index 9b558edf0..000000000 --- a/ports/geographiclib/fix-usage.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in -index 1f207b8..d469658 100644 ---- a/cmake/project-config-version.cmake.in -+++ b/cmake/project-config-version.cmake.in -@@ -22,9 +22,9 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR - # Reject if there's a mismatch in MSVC compiler versions - # set (REASON "_MSC_VER = @MSVC_VERSION@") - # set (PACKAGE_VERSION_UNSUITABLE TRUE) --elseif (NOT CMAKE_CROSSCOMPILING STREQUAL "@CMAKE_CROSSCOMPILING@") -+elseif (NOT CMAKE_CROSSCOMPILING STREQUAL FALSE) - # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} -- set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") -+ set (REASON "cross-compiling = FALSE") - set (PACKAGE_VERSION_UNSUITABLE TRUE) - elseif (CMAKE_CROSSCOMPILING AND - NOT (CMAKE_SYSTEM_NAME STREQUAL "@CMAKE_SYSTEM_NAME@" AND |