Merge pull request #7797 from patrikhuber:add-vs2017

300f9239 · Alexander Alekhin · 695b2017 · bd0a8c7e · 300f9239 · 300f9239
Commit 300f9239 authored Dec 06, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

OpenCVConfig.root-WIN32.cmake.in cmake/templates/OpenCVConfig.root-WIN32.cmake.in +2 -0

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