From c6af179afc4e4edc558e31af765caf8da22956b6 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/OpenCVConfig.cmake | 2 ++ cmake/OpenCVDetectCXXCompiler.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake index e2ce60f9fd..9069a72936 100644 --- a/cmake/OpenCVConfig.cmake +++ b/cmake/OpenCVConfig.cmake @@ -81,6 +81,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/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake index b53f8d7363..87f955c8d4 100644 --- a/cmake/OpenCVDetectCXXCompiler.cmake +++ b/cmake/OpenCVDetectCXXCompiler.cmake @@ -138,6 +138,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)