From 600b7a30e6cfc47715a96ec074f541d6f7a20d2a 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/OpenCVDetectCXXCompiler.cmake | 2 +- cmake/templates/OpenCVConfig.root-WIN32.cmake.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake index c95f8f3254..afe0459d17 100644 --- a/cmake/OpenCVDetectCXXCompiler.cmake +++ b/cmake/OpenCVDetectCXXCompiler.cmake @@ -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) diff --git a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in index bd98b713f3..7dc6666b17 100644 --- a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in +++ b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in @@ -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)