Skip to content

O
opencv
Commit 600b7a30 authored by Patrik Huber's avatar Patrik Huber
Browse files
Options

Added detection of MSVC1911 

This is VS2017 Preview. It makes sure the version is detected properly and the INSTALL target then correctly installs to x64/vc15 (the same as MSVC1910).
parent f670a992
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 600b7a30
......@@ -160,7 +160,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/templates/OpenCVConfig.root-WIN32.cmake.in
View file @ 600b7a30
......@@ -78,7 +78,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