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

TBB build defines for Linux added.

Browse Source
This commit is contained in:
Alexander Smorkalov 2013-01-11 11:23:48 +04:00
parent 60f056061a
commit ffb9da14fb
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
3rdparty/tbb/CMakeLists.txt vendored
View File

@ -115,6 +115,7 @@ file(GLOB lib_srcs "${tbb_src_dir}/src/tbb/*.cpp")
file(GLOB lib_hdrs "${tbb_src_dir}/src/tbb/*.h") file(GLOB lib_hdrs "${tbb_src_dir}/src/tbb/*.h")
list(APPEND lib_srcs "${tbb_src_dir}/src/rml/client/rml_tbb.cpp") list(APPEND lib_srcs "${tbb_src_dir}/src/rml/client/rml_tbb.cpp")
if (ANDROID)
add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0 #required add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0 #required
-D__TBB_BUILD=1 #required -D__TBB_BUILD=1 #required
-D__TBB_SURVIVE_THREAD_SWITCH=0 #no cilk on Android? -D__TBB_SURVIVE_THREAD_SWITCH=0 #no cilk on Android?
@ -122,8 +123,20 @@ add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0 #required
-DTBB_USE_GCC_BUILTINS=1 #required -DTBB_USE_GCC_BUILTINS=1 #required
-DTBB_USE_DEBUG=0 #just to be sure -DTBB_USE_DEBUG=0 #just to be sure
-DTBB_NO_LEGACY=1 #don't need backward compatibility -DTBB_NO_LEGACY=1 #don't need backward compatibility
-DDO_ITT_NOTIFY=0 #it seems that we don't need these notifications -DDO_ITT_NOTIFY=0 #it seems that we don't need these notifications on Android
) )
else()
add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=1 #required
-D__TBB_BUILD=1 #required
-D__TBB_SURVIVE_THREAD_SWITCH=1 #cilk
-DUSE_PTHREAD #required
-DTBB_USE_GCC_BUILTINS=1 #required
-DTBB_USE_DEBUG=0 #just to be sure
-DTBB_NO_LEGACY=1 #don't need backward compatibility
-DDO_ITT_NOTIFY=0 #Required
)
endif()
if(ANDROID_COMPILER_IS_CLANG) if(ANDROID_COMPILER_IS_CLANG)
add_definitions(-D__TBB_GCC_BUILTIN_ATOMICS_PRESENT=1) add_definitions(-D__TBB_GCC_BUILTIN_ATOMICS_PRESENT=1)