Skip to content

Commit ebd9615

Browse files
patrikhuberalalek
authored andcommitted
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).
1 parent 2e343ef commit ebd9615

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmake/OpenCVConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if(MSVC)
8181
set(OpenCV_RUNTIME vc12)
8282
elseif(MSVC_VERSION EQUAL 1900)
8383
set(OpenCV_RUNTIME vc14)
84-
elseif(MSVC_VERSION EQUAL 1910)
84+
elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
8585
set(OpenCV_RUNTIME vc15)
8686
endif()
8787
elseif(MINGW)

cmake/OpenCVDetectCXXCompiler.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ if(MSVC)
138138
set(OpenCV_RUNTIME vc12)
139139
elseif(MSVC_VERSION EQUAL 1900)
140140
set(OpenCV_RUNTIME vc14)
141-
elseif(MSVC_VERSION EQUAL 1910)
141+
elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
142142
set(OpenCV_RUNTIME vc15)
143143
endif()
144144
elseif(MINGW)

0 commit comments

Comments
 (0)