projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3d8395c)
Added VS2017 support (MSVC 1910)
authorPatrik Huber <patrikhuber@users.noreply.github.com>
Tue, 6 Dec 2016 00:04:24 +0000 (00:04 +0000)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 6 Dec 2016 17:22:59 +0000 (20:22 +0300)
cmake/OpenCVConfig.cmake patch | blob | history
cmake/OpenCVDetectCXXCompiler.cmake patch | blob | history

diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake
index e2ce60f..9069a72 100644 (file)
--- 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 (file)
--- 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)
Domain: Multimedia / Media Vision;