Merge pull request #3981

An error occurred

from patrikhuber:vs2015-support

10 years ago · 1aa03cecf1
parent bb44316028 2b1103c1d3
commit 1aa03cecf1
2 changed files with 4 additions and 0 deletions
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@ -79,6 +79,8 @@ if(MSVC)
    set(OpenCV_RUNTIME vc11)
  elseif(MSVC_VERSION EQUAL 1800)
    set(OpenCV_RUNTIME vc12)
+  elseif(MSVC_VERSION EQUAL 1900)
+    set(OpenCV_RUNTIME vc14)
  endif()
 elseif(MINGW)
  set(OpenCV_RUNTIME mingw)
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@ -140,6 +140,8 @@ if(MSVC)
    set(OpenCV_RUNTIME vc11)
  elseif(MSVC_VERSION EQUAL 1800)
    set(OpenCV_RUNTIME vc12)
+  elseif(MSVC_VERSION EQUAL 1900)
+    set(OpenCV_RUNTIME vc14)
  endif()
 elseif(MINGW)
  set(OpenCV_RUNTIME mingw)