third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3982 from patrikhuber:vs2015-support-master

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-05-15 12:32:27 +00:00
parent 3109c77013 40b765b7c2
commit 35884a7e3f
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVConfig.cmake
+2
View File
@@ -82,6 +82,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc11)
elseif(MSVC_VERSION EQUAL 1800)
set(OpenCV_RUNTIME vc12)
elseif(MSVC_VERSION EQUAL 1900)
set(OpenCV_RUNTIME vc14)
endif()
elseif(MINGW)
set(OpenCV_RUNTIME mingw)
cmake/OpenCVDetectCXXCompiler.cmake
+2
View File
@@ -143,6 +143,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc11)
elseif(MSVC_VERSION EQUAL 1800)
set(OpenCV_RUNTIME vc12)
elseif(MSVC_VERSION EQUAL 1900)
set(OpenCV_RUNTIME vc14)
endif()
elseif(MINGW)
set(OpenCV_RUNTIME mingw)