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:
3ae1990
)
Fixed TBB build on Android armeabi
author
mshabunin
<maksim.shabunin@gmail.com>
Fri, 2 Dec 2016 09:24:42 +0000
(12:24 +0300)
committer
mshabunin
<maksim.shabunin@gmail.com>
Fri, 2 Dec 2016 09:24:42 +0000
(12:24 +0300)
3rdparty/tbb/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/3rdparty/tbb/CMakeLists.txt
b/3rdparty/tbb/CMakeLists.txt
index
f6d5969
..
9508963
100644
(file)
--- a/
3rdparty/tbb/CMakeLists.txt
+++ b/
3rdparty/tbb/CMakeLists.txt
@@
-180,7
+180,7
@@
endif()
set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/${tbb_version_file}")
add_library(tbb ${TBB_SOURCE_FILES})
-target_compile_definitions(tbb P
RIVATE
TBB_USE_GCC_BUILTINS=1 __TBB_GCC_BUILTIN_ATOMICS_PRESENT=1)
+target_compile_definitions(tbb P
UBLIC
TBB_USE_GCC_BUILTINS=1 __TBB_GCC_BUILTIN_ATOMICS_PRESENT=1)
target_include_directories(tbb SYSTEM PUBLIC $<BUILD_INTERFACE:${tbb_src_dir}/include>)
if (WIN32)