From: Patrik Huber <patrikhuber@gmail.com>
Date: Sat, 2 May 2015 12:31:43 +0000 (+0100)
Subject: Add support for VS2015
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~211^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b1103c1d3636bff007a342c7b83737dcfb86347;p=platform%2Fupstream%2Fopencv.git

Add support for VS2015

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.
---

diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake
index 9916240..e2ce60f 100644
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@@ -79,6 +79,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)
diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
index c5e71b9..aa7a8b6 100644
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@@ -140,6 +140,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)