Skip to content

O
opencv
Commit 300f9239 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #7797 from patrikhuber:add-vs2017

parents 695b2017 bd0a8c7e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 300f9239
...@@ -160,6 +160,8 @@ if(MSVC) ...@@ -160,6 +160,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/templates/OpenCVConfig.root-WIN32.cmake.in
View file @ 300f9239
...@@ -78,6 +78,8 @@ if(MSVC) ...@@ -78,6 +78,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