Skip to content

O
opencv
Commit 8736ece9 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub
Browse files
Options

Merge pull request #9116 from alalek:backport_9110_2.4 

(2.4) Added detection of MSVC1911
parents 2e343ef6 ebd96158
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cmake/OpenCVConfig.cmake
View file @ 8736ece9
......@@ -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)
......
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 8736ece9
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment