From bd0a8c7e3f9a974b87bba4aeb55c32078478241d Mon Sep 17 00:00:00 2001 From: Patrik Huber Date: Tue, 6 Dec 2016 00:04:24 +0000 Subject: [PATCH] Added VS2017 support (MSVC 1910) --- cmake/OpenCVDetectCXXCompiler.cmake | 2 ++ cmake/templates/OpenCVConfig.root-WIN32.cmake.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake index a53746b62d..8ecf4d82bd 100644 --- a/cmake/OpenCVDetectCXXCompiler.cmake +++ b/cmake/OpenCVDetectCXXCompiler.cmake @@ -160,6 +160,8 @@ if(MSVC) set(OpenCV_RUNTIME vc12) elseif(MSVC_VERSION EQUAL 1900) set(OpenCV_RUNTIME vc14) + elseif(MSVC_VERSION EQUAL 1910) + set(OpenCV_RUNTIME vc15) endif() elseif(MINGW) set(OpenCV_RUNTIME mingw) diff --git a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in index e40140fb75..bd98b713f3 100644 --- a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in +++ b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in @@ -78,6 +78,8 @@ if(MSVC) set(OpenCV_RUNTIME vc12) elseif(MSVC_VERSION EQUAL 1900) set(OpenCV_RUNTIME vc14) + elseif(MSVC_VERSION EQUAL 1910) + set(OpenCV_RUNTIME vc15) endif() elseif(MINGW) set(OpenCV_RUNTIME mingw)