Add support for VS2015

Without the fix, OpenCV will compile and silently copy the compiled libs/executables to a location not prefixed with arch/vc14, and OpenCV won't be picked up by find_package and OpenCVConfig.cmake.
pull/3981/head
Patrik Huber 10 years ago
parent 5c12c92243
commit 2b1103c1d3
  1. 2
      cmake/OpenCVConfig.cmake
  2. 2
      cmake/OpenCVDetectCXXCompiler.cmake

@ -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)

@ -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)

Loading…
Cancel
Save