Merge pull request #5869 from atinfinity:pullreq/151223-FindTBB-VS2015-2.4

9 years ago · f7c8f74ac1
parent 178ed63e1a c4e80952ce
commit f7c8f74ac1
1 changed files with 2 additions and 0 deletions
--- 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}")