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

9c58741d · Alexander Alekhin · a4aeba37 · d16723f4 · 9c58741d
显示空白变更内容
内联并排

Showing with 2 addition and 0 deletion

cmake/OpenCVDetectTBB.cmake cmake/OpenCVDetectTBB.cmake +2 -0

未找到文件。
--- 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}")