potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Slightly improved build of TBB for Android

Browse Source
This commit is contained in:
Andrey Kamaev
2012-02-27 06:19:25 +00:00
parent 8b6aec6710
commit c6445e2de1
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVDetectTBB.cmake
+2 -4
View File
@@ -1,11 +1,9 @@
if(ANDROID)
set(HAVE_TBB 1)
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/tbb")
if(NOT ${TBB_INCLUDE_DIRS} STREQUAL "")
include_directories(${TBB_INCLUDE_DIRS})
endif()
include_directories(${TBB_INCLUDE_DIRS})
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb)
add_definitions(-DTBB_USE_GCC_BUILTINS=1 -D__TBB_GCC_BUILTIN_ATOMICS_PRESENT=1 -D__TBB_USE_GENERIC_DWORD_LOAD_STORE=1)
set(HAVE_TBB 1)
elseif(UNIX AND NOT APPLE)
PKG_CHECK_MODULES(TBB tbb)