Merge pull request #3981 from patrikhuber:vs2015-support

1aa03cec · Vadim Pisarevsky · bb443160 · 2b1103c1 · 1aa03cec · 1aa03cec
Commit 1aa03cec authored May 06, 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
@@ -79,6 +79,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
@@ -140,6 +140,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)