diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-02-21 16:47:42 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-23 17:06:37 -0800 |
| commit | 471f7dc9700f7618aa16274fb9961e4e068f7656 (patch) | |
| tree | 87e418ecbd19bfd6a54cf1c8fd9a003bd9a4722d /ports/opencv/msvs-fix-2017-u5.patch | |
| parent | 5609d34b39009a2b511ae85ee5d8484d1db514c5 (diff) | |
| download | vcpkg-471f7dc9700f7618aa16274fb9961e4e068f7656.tar.gz vcpkg-471f7dc9700f7618aa16274fb9961e4e068f7656.zip | |
[opencv] Rework
Split off contrib, ipp, webp, openexr, tiff, png, tiff, jpeg, jasper, eigen into features.
Prevent downloads during the build
Diffstat (limited to 'ports/opencv/msvs-fix-2017-u5.patch')
| -rw-r--r-- | ports/opencv/msvs-fix-2017-u5.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/ports/opencv/msvs-fix-2017-u5.patch b/ports/opencv/msvs-fix-2017-u5.patch deleted file mode 100644 index ab0d0d0ff..000000000 --- a/ports/opencv/msvs-fix-2017-u5.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - |