From ebd961585e6d2bedec4fda98014f5363faaf84f4 Mon Sep 17 00:00:00 2001 From: Patrik Huber Date: Thu, 6 Jul 2017 19:02:19 +0100 Subject: [PATCH] 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). --- cmake/OpenCVConfig.cmake | 2 +- cmake/OpenCVDetectCXXCompiler.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake index 9069a72936..fa35b6fc3f 100644 --- a/cmake/OpenCVConfig.cmake +++ b/cmake/OpenCVConfig.cmake @@ -81,7 +81,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) diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake index 191abd8862..b84c8f3c77 100644 --- a/cmake/OpenCVDetectCXXCompiler.cmake +++ b/cmake/OpenCVDetectCXXCompiler.cmake @@ -138,7 +138,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)