Merge pull request #3982 from patrikhuber:vs2015-support-master

35884a7e · Vadim Pisarevsky · 3109c770 · 40b765b7 · 35884a7e · 35884a7e
Commit 35884a7e authored May 15, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

OpenCVConfig.cmake cmake/OpenCVConfig.cmake +2 -0

OpenCVDetectCXXCompiler.cmake cmake/OpenCVDetectCXXCompiler.cmake +2 -0

No files found.
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@@ -82,6 +82,8 @@ if(MSVC)
    set(OpenCV_RUNTIME vc11)
  elseif(MSVC_VERSION EQUAL 1800)
    set(OpenCV_RUNTIME vc12)
+  elseif(MSVC_VERSION EQUAL 1900)
+    set(OpenCV_RUNTIME vc14)
  endif()
 elseif(MINGW)
  set(OpenCV_RUNTIME mingw)

--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@@ -143,6 +143,8 @@ if(MSVC)
    set(OpenCV_RUNTIME vc11)
  elseif(MSVC_VERSION EQUAL 1800)
    set(OpenCV_RUNTIME vc12)
+  elseif(MSVC_VERSION EQUAL 1900)
+    set(OpenCV_RUNTIME vc14)
  endif()
 elseif(MINGW)
  set(OpenCV_RUNTIME mingw)