Skip to content

O
opencv
Commit 7be4a0ee authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #7809 from alalek:backport_7797

parents 25727454 c6af179a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cmake/OpenCVConfig.cmake
View file @ 7be4a0ee
...@@ -81,6 +81,8 @@ if(MSVC) ...@@ -81,6 +81,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc12) set(OpenCV_RUNTIME vc12)
elseif(MSVC_VERSION EQUAL 1900) elseif(MSVC_VERSION EQUAL 1900)
set(OpenCV_RUNTIME vc14) set(OpenCV_RUNTIME vc14)
elseif(MSVC_VERSION EQUAL 1910)
set(OpenCV_RUNTIME vc15)
endif() endif()
elseif(MINGW) elseif(MINGW)
set(OpenCV_RUNTIME mingw) set(OpenCV_RUNTIME mingw)
......
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 7be4a0ee
...@@ -138,6 +138,8 @@ if(MSVC) ...@@ -138,6 +138,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc12) set(OpenCV_RUNTIME vc12)
elseif(MSVC_VERSION EQUAL 1900) elseif(MSVC_VERSION EQUAL 1900)
set(OpenCV_RUNTIME vc14) set(OpenCV_RUNTIME vc14)
elseif(MSVC_VERSION EQUAL 1910)
set(OpenCV_RUNTIME vc15)
endif() endif()
elseif(MINGW) elseif(MINGW)
set(OpenCV_RUNTIME mingw) set(OpenCV_RUNTIME 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