mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 04:12:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for VS2015

Browse Source 
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.
This commit is contained in:
Patrik Huber 2015-05-02 13:31:43 +01:00
parent 5c12c92243
commit 2b1103c1d3
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVConfig.cmake
View File

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

2
cmake/OpenCVDetectCXXCompiler.cmake
View File

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