generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin 2015-12-23 16:16:31 +00:00
commit 9c58741dba
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVDetectTBB.cmake
View File

@ -65,6 +65,8 @@ if(NOT HAVE_TBB)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc11") set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc11")
elseif(MSVC12) elseif(MSVC12)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc12") set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc12")
elseif(MSVC14)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc14")
endif() endif()
set(TBB_LIB_DIR "${_TBB_LIB_PATH}" CACHE PATH "Full path of TBB library directory") set(TBB_LIB_DIR "${_TBB_LIB_PATH}" CACHE PATH "Full path of TBB library directory")
link_directories("${TBB_LIB_DIR}") link_directories("${TBB_LIB_DIR}")