projects / profile / ivi / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cdf4e4e)
Added Visual Studio 2013 detection.
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 18 Nov 2013 15:39:39 +0000 (19:39 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 18 Nov 2013 15:39:39 +0000 (19:39 +0400)
cmake/OpenCVConfig.cmake patch | blob | history
cmake/OpenCVDetectCXXCompiler.cmake patch | blob | history

diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake
index c7839c6..2d80f76 100644 (file)
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@@ -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)
diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
index e2691d8..819c2e0 100644 (file)
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@@ -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)
Domain: Multimedia / Uncategorized;