Merge pull request #7797 from patrikhuber:add-vs2017

8 years ago · 300f92397e
parent 695b20172b bd0a8c7e3f
commit 300f92397e
2 changed files with 4 additions and 0 deletions
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@ -160,6 +160,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/templates/OpenCVConfig.root-WIN32.cmake.in
+++ b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
@ -78,6 +78,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)