projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
26e3bcb
)
Added suuport for finding Intel TBB for Visual Studio 2013
author
Abhijit Kundu
<abhijit.kundu@gatech.edu>
Mon, 28 Apr 2014 11:23:49 +0000
(07:23 -0400)
committer
Dikay900
<dark900@xyz.de>
Sat, 25 Apr 2015 08:23:34 +0000
(10:23 +0200)
cmake/OpenCVDetectTBB.cmake
patch
|
blob
|
history
diff --git
a/cmake/OpenCVDetectTBB.cmake
b/cmake/OpenCVDetectTBB.cmake
index
fe8e100
..
8ff78bb
100644
(file)
--- 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}")