cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-11-27 13:10:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix building pdal after VS2019 upgrade (#8326)

Browse Source
This commit is contained in:
Curtis J Bezault 2019-09-24 14:35:47 -07:00 committed by GitHub
parent 3532a7cf3c
commit 863285f627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/proj4/0004-CMake-skip-msvc-check.patch Normal file
View File

@ -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@")

1
ports/proj4/portfile.cmake
View File

@ -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")