Skip to content

O
opencv
Commit 1aa03cec authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #3981 from patrikhuber:vs2015-support

parents bb443160 2b1103c1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cmake/OpenCVConfig.cmake
View file @ 1aa03cec
...@@ -79,6 +79,8 @@ if(MSVC) ...@@ -79,6 +79,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 @ 1aa03cec
...@@ -140,6 +140,8 @@ if(MSVC) ...@@ -140,6 +140,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