[opencv] 63/89: Added VS2017 support (MSVC 1910)

Nobuhiro Iwamatsu iwamatsu at moszumanska.debian.org
Sat May 13 09:57:26 UTC 2017


This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit c6af179afc4e4edc558e31af765caf8da22956b6
Author: Patrik Huber <patrikhuber at users.noreply.github.com>
Date:   Tue Dec 6 00:04:24 2016 +0000

    Added VS2017 support (MSVC 1910)
---
 cmake/OpenCVConfig.cmake            | 2 ++
 cmake/OpenCVDetectCXXCompiler.cmake | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake
index e2ce60f..9069a72 100644
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@@ -81,6 +81,8 @@ if(MSVC)
     set(OpenCV_RUNTIME vc12)
   elseif(MSVC_VERSION EQUAL 1900)
     set(OpenCV_RUNTIME vc14)
+  elseif(MSVC_VERSION EQUAL 1910)
+    set(OpenCV_RUNTIME vc15)
   endif()
 elseif(MINGW)
   set(OpenCV_RUNTIME mingw)
diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
index b53f8d7..87f955c 100644
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@@ -138,6 +138,8 @@ if(MSVC)
     set(OpenCV_RUNTIME vc12)
   elseif(MSVC_VERSION EQUAL 1900)
     set(OpenCV_RUNTIME vc14)
+  elseif(MSVC_VERSION EQUAL 1910)
+    set(OpenCV_RUNTIME vc15)
   endif()
 elseif(MINGW)
   set(OpenCV_RUNTIME mingw)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git



More information about the debian-science-commits mailing list