Merge pull request #2678 from intbots:master

87210690 · Alexander Alekhin · OpenCV Buildbot · a5378186 · 26c8b3a3 · 87210690
Commit 87210690 authored May 05, 2014 by Alexander Alekhin Committed by OpenCV Buildbot May 05, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

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

No files found.
--- a/cmake/OpenCVDetectTBB.cmake
+++ b/cmake/OpenCVDetectTBB.cmake
@@ -63,6 +63,8 @@ if(NOT HAVE_TBB)
          set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc10")
        elseif(MSVC11)
          set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc11")
+        elseif(MSVC12)
+          set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc12")
        endif()
        set(TBB_LIB_DIR "${_TBB_LIB_PATH}" CACHE PATH "Full path of TBB library directory")
        link_directories("${TBB_LIB_DIR}")