Merge pull request #7809 from alalek:backport_7797

7be4a0ee · Alexander Alekhin · 25727454 · c6af179a · 7be4a0ee · 7be4a0ee
Commit 7be4a0ee authored Dec 07, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

OpenCVConfig.cmake cmake/OpenCVConfig.cmake +2 -0

OpenCVDetectCXXCompiler.cmake cmake/OpenCVDetectCXXCompiler.cmake +2 -0

No files found.
--- 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)

--- 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)