potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #1822 from SpecLad:msvc12

Browse Source
This commit is contained in:
Roman Donchenko
2013-11-25 12:19:58 +04:00
committed by OpenCV Buildbot
parent 4c5593b633 239704f986
commit 75fba08042
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
@@ -77,6 +77,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc10)
elseif(MSVC_VERSION EQUAL 1700)
set(OpenCV_RUNTIME vc11)
elseif(MSVC_VERSION EQUAL 1800)
set(OpenCV_RUNTIME vc12)
endif()
elseif(MINGW)
set(OpenCV_RUNTIME mingw)
cmake/OpenCVDetectCXXCompiler.cmake
+2
View File
@@ -136,6 +136,8 @@ if(MSVC)
set(OpenCV_RUNTIME vc10)
elseif(MSVC_VERSION EQUAL 1700)
set(OpenCV_RUNTIME vc11)
elseif(MSVC_VERSION EQUAL 1800)
set(OpenCV_RUNTIME vc12)
endif()
elseif(MINGW)
set(OpenCV_RUNTIME mingw)