[opencv] 08/98: changed to find TBB library(VS2015)

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit c4e80952ced54978e8e6294a93d28ede251e8e9d
Author: atinfinity <dandelion1124 at gmail.com>
Date:   Wed Dec 23 23:43:01 2015 +0900

    changed to find TBB library(VS2015)
---
 cmake/OpenCVDetectTBB.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/OpenCVDetectTBB.cmake b/cmake/OpenCVDetectTBB.cmake
index 8ff78bb..be40b47 100644
--- a/cmake/OpenCVDetectTBB.cmake
+++ b/cmake/OpenCVDetectTBB.cmake
@@ -65,6 +65,8 @@ if(NOT HAVE_TBB)
           set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc11")
         elseif(MSVC12)
           set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc12")
+        elseif(MSVC14)
+          set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc14")
         endif()
         set(TBB_LIB_DIR "${_TBB_LIB_PATH}" CACHE PATH "Full path of TBB library directory")
         link_directories("${TBB_LIB_DIR}")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git