Merge pull request #9110 from patrikhuber:fix-msvc1911-cmake

0e6ebafd · Alexander Alekhin · 7d17d20d · 600b7a30 · 0e6ebafd · 0e6ebafd
Commit 0e6ebafd authored Jul 14, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

OpenCVConfig.root-WIN32.cmake.in cmake/templates/OpenCVConfig.root-WIN32.cmake.in +1 -1

No files found.
--- 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)

--- 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)