Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
f44a0960
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f44a0960
编写于
3月 24, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16894 from alalek:update_tbb
上级
b1ed003d
fa002bde
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
6 deletion
+20
-6
3rdparty/tbb/CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
+20
-6
未找到文件。
3rdparty/tbb/CMakeLists.txt
浏览文件 @
f44a0960
#Cross compile TBB from source
project
(
tbb
)
project
(
tbb
CXX
)
if
(
WIN32 AND NOT ARM
)
message
(
FATAL_ERROR
"BUILD_TBB option supports Windows on ARM only!
\n
Use regular official TBB build instead of the BUILD_TBB option!"
)
endif
()
ocv_update
(
OPENCV_TBB_RELEASE
"v2020.
0
"
)
ocv_update
(
OPENCV_TBB_RELEASE_MD5
"
5858dd01ec007c139d5d178b21e06dae
"
)
ocv_update
(
OPENCV_TBB_RELEASE
"v2020.
1
"
)
ocv_update
(
OPENCV_TBB_RELEASE_MD5
"
734f335d06ee80a7d4a20cc0da734c59
"
)
ocv_update
(
OPENCV_TBB_FILENAME
"
${
OPENCV_TBB_RELEASE
}
.tar.gz"
)
string
(
REGEX REPLACE
"^v"
""
OPENCV_TBB_RELEASE_
"
${
OPENCV_TBB_RELEASE
}
"
)
ocv_update
(
OPENCV_TBB_SUBDIR
"tbb-
${
OPENCV_TBB_RELEASE_
}
"
)
#ocv_update(OPENCV_TBB_SUBDIR ...
)
set
(
tbb_src_dir
"
${
OpenCV_BINARY_DIR
}
/3rdparty/tbb"
)
ocv_download
(
FILENAME
${
OPENCV_TBB_FILENAME
}
...
...
@@ -25,6 +25,16 @@ ocv_download(FILENAME ${OPENCV_TBB_FILENAME}
if
(
NOT res
)
return
()
endif
()
if
(
OPENCV_TBB_SUBDIR
)
# use current value
ocv_assert
(
EXISTS
"
${
tbb_src_dir
}
/
${
OPENCV_TBB_SUBDIR
}
"
)
elseif
(
EXISTS
"
${
tbb_src_dir
}
/oneTBB-
${
OPENCV_TBB_RELEASE_
}
"
)
set
(
OPENCV_TBB_SUBDIR
"oneTBB-
${
OPENCV_TBB_RELEASE_
}
"
)
elseif
(
EXISTS
"
${
tbb_src_dir
}
/tbb-
${
OPENCV_TBB_RELEASE_
}
"
)
set
(
OPENCV_TBB_SUBDIR
"oneTBB-
${
OPENCV_TBB_RELEASE_
}
"
)
else
()
message
(
FATAL_ERROR
"TBB: Can't configure TBB. Specify OPENCV_TBB_SUBDIR through command-line."
)
endif
()
set
(
tbb_src_dir
"
${
tbb_src_dir
}
/
${
OPENCV_TBB_SUBDIR
}
"
)
ocv_include_directories
(
"
${
tbb_src_dir
}
/include"
...
...
@@ -36,11 +46,11 @@ file(GLOB lib_srcs "${tbb_src_dir}/src/tbb/*.cpp")
file
(
GLOB lib_hdrs
"
${
tbb_src_dir
}
/src/tbb/*.h"
)
list
(
APPEND lib_srcs
"
${
tbb_src_dir
}
/src/rml/client/rml_tbb.cpp"
)
ocv_list_filterout
(
lib_srcs
"
${
tbb_src_dir
}
/src/tbb/tbbbind.cpp"
)
# hwloc.h requirement
ocv_list_filterout
(
lib_srcs
"
${
tbb_src_dir
}
/src/tbb/tbb_bind.cpp"
)
# hwloc.h requirement 2020.1+
if
(
WIN32
)
add_definitions
(
/D__TBB_DYNAMIC_LOAD_ENABLED=0
/D__TBB_BUILD=1
/DTBB_SUPPRESS_DEPRECATED_MESSAGES=1
/DTBB_NO_LEGACY=1
/D_UNICODE
/DUNICODE
...
...
@@ -99,7 +109,11 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${tbb_version_file}.cmakein" "${CMAK
list
(
APPEND TBB_SOURCE_FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
tbb_version_file
}
"
)
add_library
(
tbb
${
TBB_SOURCE_FILES
}
)
target_compile_definitions
(
tbb PUBLIC TBB_USE_GCC_BUILTINS=1 __TBB_GCC_BUILTIN_ATOMICS_PRESENT=1
)
target_compile_definitions
(
tbb PUBLIC
TBB_USE_GCC_BUILTINS=1
__TBB_GCC_BUILTIN_ATOMICS_PRESENT=1
TBB_SUPPRESS_DEPRECATED_MESSAGES=1
)
target_include_directories
(
tbb SYSTEM PUBLIC $<BUILD_INTERFACE:
${
tbb_src_dir
}
/include>
PRIVATE
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录