Merge pull request #1822 from SpecLad:msvc12

11 years ago · 75fba08042
parent 4c5593b633 239704f986
commit 75fba08042
2 changed files with 4 additions and 0 deletions
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@ -77,6 +77,8 @@ if(MSVC)
    set(OpenCV_RUNTIME vc10)
  elseif(MSVC_VERSION EQUAL 1700)
    set(OpenCV_RUNTIME vc11)
+  elseif(MSVC_VERSION EQUAL 1800)
+    set(OpenCV_RUNTIME vc12)
  endif()
 elseif(MINGW)
  set(OpenCV_RUNTIME mingw)
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@ -136,6 +136,8 @@ if(MSVC)
    set(OpenCV_RUNTIME vc10)
  elseif(MSVC_VERSION EQUAL 1700)
    set(OpenCV_RUNTIME vc11)
+  elseif(MSVC_VERSION EQUAL 1800)
+    set(OpenCV_RUNTIME vc12)
  endif()
 elseif(MINGW)
  set(OpenCV_RUNTIME mingw)