Skip to content

O
opencv
Commit 75fba080 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #1822 from SpecLad:msvc12

parents 4c5593b6 239704f9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cmake/OpenCVConfig.cmake
View file @ 75fba080
...@@ -77,6 +77,8 @@ if(MSVC) ...@@ -77,6 +77,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc10) set(OpenCV_RUNTIME vc10)
elseif(MSVC_VERSION EQUAL 1700) elseif(MSVC_VERSION EQUAL 1700)
set(OpenCV_RUNTIME vc11) set(OpenCV_RUNTIME vc11)
elseif(MSVC_VERSION EQUAL 1800)
set(OpenCV_RUNTIME vc12)
endif() endif()
elseif(MINGW) elseif(MINGW)
set(OpenCV_RUNTIME mingw) set(OpenCV_RUNTIME mingw)
......
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 75fba080
...@@ -136,6 +136,8 @@ if(MSVC) ...@@ -136,6 +136,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc10) set(OpenCV_RUNTIME vc10)
elseif(MSVC_VERSION EQUAL 1700) elseif(MSVC_VERSION EQUAL 1700)
set(OpenCV_RUNTIME vc11) set(OpenCV_RUNTIME vc11)
elseif(MSVC_VERSION EQUAL 1800)
set(OpenCV_RUNTIME vc12)
endif() endif()
elseif(MINGW) elseif(MINGW)
set(OpenCV_RUNTIME mingw) set(OpenCV_RUNTIME mingw)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment