mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 09:53:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[opencv] add support for MSVS 2017 update 5 (#2132)

Browse Source
This commit is contained in:
Mikhail Paulyshka 2017-11-05 01:11:48 +03:00 committed by Robert Schumacher
parent 30f7421602
commit 32d588aa69
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/opencv/CONTROL
View File

@ -1,5 +1,5 @@
Source: opencv
Version: 3.3.1-6
Version: 3.3.1-7
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows)
Description: computer vision library

39
ports/opencv/msvs-fix-2017-u5.patch Normal file
View File

@ -0,0 +1,39 @@
From 62737c777c9314ee2e4b4e595daa830ba12765e2 Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <me@mixaill.tk>
Date: Sat, 4 Nov 2017 23:52:37 +0300
Subject: [PATCH] cmake: add support for MSVS 2017 update 5
---
cmake/OpenCVDetectCXXCompiler.cmake | 2 +-
cmake/templates/OpenCVConfig.root-WIN32.cmake.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
index cfb613b..3874467 100644
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@@ -114,7 +114,7 @@ if(MSVC)
set(OpenCV_RUNTIME vc12)
elseif(MSVC_VERSION EQUAL 1900)
set(OpenCV_RUNTIME vc14)
- elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
+ elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911 OR MSVC_VERSION EQUAL 1912)
set(OpenCV_RUNTIME vc15)
else()
message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME")
diff --git a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
index 7dc6666..846c400 100644
--- a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
+++ b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
@@ -78,7 +78,7 @@ if(MSVC)
set(OpenCV_RUNTIME vc12)
elseif(MSVC_VERSION EQUAL 1900)
set(OpenCV_RUNTIME vc14)
- elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
+ elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911 OR MSVC_VERSION EQUAL 1912)
set(OpenCV_RUNTIME vc15)
endif()
elseif(MINGW)
--
2.14.1.windows.1

1
ports/opencv/portfile.cmake
View File

@ -14,6 +14,7 @@ vcpkg_apply_patches(
"${CMAKE_CURRENT_LIST_DIR}/001-fix-uwp.patch"
"${CMAKE_CURRENT_LIST_DIR}/002-fix-uwp.patch"
"${CMAKE_CURRENT_LIST_DIR}/no-double-expand-enable-pylint.patch"
"${CMAKE_CURRENT_LIST_DIR}/msvs-fix-2017-u5.patch"
)
file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/libjpeg ${SOURCE_PATH}/3rdparty/libpng ${SOURCE_PATH}/3rdparty/zlib ${SOURCE_PATH}/3rdparty/libtiff)