Skip to content

O
opencv
Commit 62737c77 authored by Mikhail Paulyshka's avatar Mikhail Paulyshka
Browse files
Options

cmake: add support for MSVS 2017 update 5

parent 7267e94b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 62737c77
...@@ -114,7 +114,7 @@ if(MSVC) ...@@ -114,7 +114,7 @@ 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 OR MSVC_VERSION EQUAL 1911) elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911 OR MSVC_VERSION EQUAL 1912)
set(OpenCV_RUNTIME vc15) set(OpenCV_RUNTIME vc15)
else() else()
message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME") message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME")
......
cmake/templates/OpenCVConfig.root-WIN32.cmake.in
View file @ 62737c77
...@@ -78,7 +78,7 @@ if(MSVC) ...@@ -78,7 +78,7 @@ 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 OR MSVC_VERSION EQUAL 1911) elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911 OR MSVC_VERSION EQUAL 1912)
set(OpenCV_RUNTIME vc15) set(OpenCV_RUNTIME vc15)
endif() endif()
elseif(MINGW) 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