diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/proj4 | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/proj4')
| -rw-r--r-- | ports/proj4/0004-CMake-skip-msvc-check.patch | 15 | ||||
| -rw-r--r-- | ports/proj4/CONTROL | 2 | ||||
| -rw-r--r-- | ports/proj4/portfile.cmake | 1 |
3 files changed, 1 insertions, 17 deletions
diff --git a/ports/proj4/0004-CMake-skip-msvc-check.patch b/ports/proj4/0004-CMake-skip-msvc-check.patch deleted file mode 100644 index be9021da0..000000000 --- a/ports/proj4/0004-CMake-skip-msvc-check.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/project-config-version.cmake.in b/project-config-version.cmake.in -index ce2820c..f90706c 100644 ---- a/project-config-version.cmake.in -+++ b/project-config-version.cmake.in -@@ -18,10 +18,6 @@ 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@") -- # 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@") - # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} - set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index f2a6ae8b6..790b8f70f 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,4 +1,4 @@ Source: proj4 -Version: 4.9.3-4 +Version: 4.9.3-5 Homepage: https://download.osgeo.org/proj Description: PROJ.4 library for cartographic projections diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 8ea13cafc..70878aae6 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -16,7 +16,6 @@ vcpkg_extract_source_archive_ex( 0001-CMake-add-detection-of-recent-visual-studio-versions.patch 0002-CMake-fix-error-by-only-setting-properties-for-targe.patch 0003-CMake-configurable-cmake-config-install-location.patch - 0004-CMake-skip-msvc-check.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") |