diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-09-24 14:35:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 14:35:47 -0700 |
| commit | 863285f627b75c468c54182047f9a63c51bb5425 (patch) | |
| tree | 942be00e52273e04947eb53d27bf275074108c88 | |
| parent | 3532a7cf3cb81ad4c56775a2b02039ee77a96eb2 (diff) | |
| download | vcpkg-863285f627b75c468c54182047f9a63c51bb5425.tar.gz vcpkg-863285f627b75c468c54182047f9a63c51bb5425.zip | |
Fix building pdal after VS2019 upgrade (#8326)
| -rw-r--r-- | ports/proj4/0004-CMake-skip-msvc-check.patch | 15 | ||||
| -rw-r--r-- | ports/proj4/portfile.cmake | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/ports/proj4/0004-CMake-skip-msvc-check.patch b/ports/proj4/0004-CMake-skip-msvc-check.patch new file mode 100644 index 000000000..be9021da0 --- /dev/null +++ b/ports/proj4/0004-CMake-skip-msvc-check.patch @@ -0,0 +1,15 @@ +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/portfile.cmake b/ports/proj4/portfile.cmake index 70878aae6..8ea13cafc 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -16,6 +16,7 @@ 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") |