cmake: add support for MSVC 14.1 minor upgrades

61d82926 · Stefan Dinkelacker · 43f1b72e · 61d82926 · 61d82926
Commit 61d82926 authored Jan 04, 2018 by Stefan Dinkelacker
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

OpenCVConfig.cmake cmake/OpenCVConfig.cmake +1 -1

OpenCVDetectCXXCompiler.cmake cmake/OpenCVDetectCXXCompiler.cmake +1 -1

No files found.
--- 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 OR MSVC_VERSION EQUAL 1911)
+  elseif(MSVC_VERSION MATCHES "^191[0-9]$")
    set(OpenCV_RUNTIME vc15)
  endif()
 elseif(MINGW)

--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@@ -100,7 +100,7 @@ if(MSVC)
    set(OpenCV_RUNTIME vc12)
  elseif(MSVC_VERSION EQUAL 1900)
    set(OpenCV_RUNTIME vc14)
-  elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
+  elseif(MSVC_VERSION MATCHES "^191[0-9]$")
    set(OpenCV_RUNTIME vc15)
  endif()
 elseif(MINGW)