generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add VS2015 compatibility to CMake scripts

Browse Source
This commit is contained in:
Patrik Huber
2015-05-02 15:24:14 +01:00
parent e01b485ac6
commit 40b765b7c2
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVConfig.cmake
View File

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

2
cmake/OpenCVDetectCXXCompiler.cmake
View File

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