Skip to content

O
opencv
Commit 40b765b7 authored by Patrik Huber's avatar Patrik Huber
Browse files
Options

Add VS2015 compatibility to CMake scripts

parent e01b485a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cmake/OpenCVConfig.cmake
View file @ 40b765b7
...@@ -82,6 +82,8 @@ if(MSVC) ...@@ -82,6 +82,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc11) set(OpenCV_RUNTIME vc11)
elseif(MSVC_VERSION EQUAL 1800) elseif(MSVC_VERSION EQUAL 1800)
set(OpenCV_RUNTIME vc12) set(OpenCV_RUNTIME vc12)
elseif(MSVC_VERSION EQUAL 1900)
set(OpenCV_RUNTIME vc14)
endif() endif()
elseif(MINGW) elseif(MINGW)
set(OpenCV_RUNTIME mingw) set(OpenCV_RUNTIME mingw)
......
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 40b765b7
...@@ -143,6 +143,8 @@ if(MSVC) ...@@ -143,6 +143,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc11) set(OpenCV_RUNTIME vc11)
elseif(MSVC_VERSION EQUAL 1800) elseif(MSVC_VERSION EQUAL 1800)
set(OpenCV_RUNTIME vc12) set(OpenCV_RUNTIME vc12)
elseif(MSVC_VERSION EQUAL 1900)
set(OpenCV_RUNTIME vc14)
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