mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 15:31:47 +08:00
a9303736fd
* [LibLZMA] add a config-generated by CMake * bump control files of LibLZMA and dependent ports * [tiff] use proper liblzma target [OpenCV] add an explicit dependency on LibLZMA for static linking * [liblzma] fix header install path * [LibLZMA] avoid using targets in old symbols * fixes for windows-static and trying to see if CI is happier with a share/lib folder written in lowercase * [LibLZMA] use only modern CMake language, remove patch in favour of target public definition * [lzma] put symbols in cmake cache * [libxmlpp] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS regression * [lzma] fix header install path * [liblzma] install wrapper to force config mode * [liblzma] remove function check inside cmake config since we know it will pass * [liblzma] wrapper fix * [tiff,geotiff] general cleanup and patch fixes * [libgeotiff] remove debug tools * [tesseract] modernize * [tiff] fix also tiff_library symbol * [pdal,libgeotiff] better library integration * [tiff] restore using unix i/o on UWP, since it was working... for sure win32 one cannot work * [tiff] enable lzma also on uwp, since it works and is requested by many dependencies * [selene] enable build on arm/arm64-windows, which was surely broken before * [lzma] uniform naming with cmake 3.14 * [podofo] fix regression, it requires openssl which was disabled in dependencies * [many ports] remove unnecessary mods * [boost-iostream] chmod * [openssl] fix regression due to missing architecture * [podofo] fix regression on uwp due to missing include * [libpq] explicitly fail on UWP, it should avoid being marked as regression * [shiva] fix regression on linux
27 lines
810 B
Diff
27 lines
810 B
Diff
From ca8bb14234091ab7b1ada2b9e5abb04f40d459cb Mon Sep 17 00:00:00 2001
|
|
From: Manuel Massing <Manuel Massing m.massing@warped-space.de>
|
|
Date: Tue, 22 Nov 2016 12:00:39 +0100
|
|
Subject: [PATCH 1/3] CMake: add detection of recent visual studio versions
|
|
|
|
---
|
|
cmake/Proj4SystemInfo.cmake | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/cmake/Proj4SystemInfo.cmake b/cmake/Proj4SystemInfo.cmake
|
|
index 294a50b..c7fb6bf 100644
|
|
--- a/cmake/Proj4SystemInfo.cmake
|
|
+++ b/cmake/Proj4SystemInfo.cmake
|
|
@@ -50,6 +50,9 @@ if(WIN32)
|
|
if(MSVC_VERSION EQUAL 1800)
|
|
set(PROJ_COMPILER_NAME "msvc-12.0") #Visual Studio 2013
|
|
endif()
|
|
+ if(MSVC_VERSION GREATER_EQUAL 1900)
|
|
+ set(PROJ_COMPILER_NAME "msvc-14.0") #Visual Studio 2015/2017/2019
|
|
+ endif()
|
|
endif(MSVC)
|
|
|
|
if(MINGW)
|
|
--
|
|
2.9.2.windows.1
|
|
|