Merge pull request opencv#9116 from alalek:backport_9110_2.4

alalek · web-flow · commit 8736ece97d3d · 2017-07-10T08:07:48.000Z
(2.4) Added detection of MSVC1911
diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake
@@ -81,7 +81,7 @@ if(MSVC)
     set(OpenCV_RUNTIME vc12)
   elseif(MSVC_VERSION EQUAL 1900)
     set(OpenCV_RUNTIME vc14)
-  elseif(MSVC_VERSION EQUAL 1910)
+  elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
     set(OpenCV_RUNTIME vc15)
   endif()
 elseif(MINGW)
diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
@@ -138,7 +138,7 @@ if(MSVC)
     set(OpenCV_RUNTIME vc12)
   elseif(MSVC_VERSION EQUAL 1900)
     set(OpenCV_RUNTIME vc14)
-  elseif(MSVC_VERSION EQUAL 1910)
+  elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
     set(OpenCV_RUNTIME vc15)
   endif()
 elseif(MINGW)
