Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
7882aba7
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 10 个月
通知
995
Star
71100
Fork
55580
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7882aba7
编写于
1月 10, 2013
作者:
A
Alexander Smorkalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TBB download and build option enabled for non Android platfroms.
上级
2e2e1355
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
15 deletion
+24
-15
3rdparty/tbb/CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
+16
-7
CMakeLists.txt
CMakeLists.txt
+7
-7
cmake/OpenCVDetectTBB.cmake
cmake/OpenCVDetectTBB.cmake
+1
-1
未找到文件。
3rdparty/tbb/CMakeLists.txt
浏览文件 @
7882aba7
#build TBB for Android from source
if
(
NOT ANDROID
)
message
(
FATAL_ERROR
"The script is designed for Android only!"
)
endif
()
project
(
tbb
)
# 4.1 update 1 - works fine
...
...
@@ -140,13 +136,26 @@ if(tbb_need_GENERIC_DWORD_LOAD_STORE)
set
(
tbb_need_GENERIC_DWORD_LOAD_STORE ON PARENT_SCOPE
)
endif
()
add_library
(
tbb STATIC
${
lib_srcs
}
${
lib_hdrs
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android_additional.h"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
tbb_version_file
}
"
)
target_link_libraries
(
tbb c m dl
)
if
(
ANDROID
)
set
(
TBB_SOURCE_FILES
${
lib_srcs
}
${
lib_hdrs
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android_additional.h"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
tbb_version_file
}
"
)
else
()
set
(
TBB_SOURCE_FILES
${
lib_srcs
}
${
lib_hdrs
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
tbb_version_file
}
"
)
endif
()
if
(
BUILD_SHARED_LIBS
)
add_library
(
tbb SHARED
${
TBB_SOURCE_FILES
}
)
target_link_libraries
(
tbb c m dl
)
else
()
add_library
(
tbb STATIC
${
TBB_SOURCE_FILES
}
)
target_link_libraries
(
tbb c m dl
)
endif
()
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations
)
string
(
REPLACE
"-Werror=non-virtual-dtor"
""
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-include
\"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android_additional.h
\"
"
)
if
(
ANDROID
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-include
\"
${
CMAKE_CURRENT_SOURCE_DIR
}
/android_additional.h
\"
"
)
endif
()
set_target_properties
(
tbb
PROPERTIES OUTPUT_NAME tbb
...
...
CMakeLists.txt
浏览文件 @
7882aba7
...
...
@@ -163,13 +163,13 @@ OCV_OPTION(BUILD_ANDROID_SERVICE "Build OpenCV Manager for Google Play" OFF I
OCV_OPTION
(
BUILD_ANDROID_PACKAGE
"Build platform-specific package for Google Play"
OFF IF ANDROID
)
# 3rd party libs
OCV_OPTION
(
BUILD_ZLIB
"Build zlib from source"
WIN32 OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_TIFF
"Build libtiff from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_JASPER
"Build libjasper from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_JPEG
"Build libjpeg from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_PNG
"Build libpng from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_OPENEXR
"Build openexr from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_ZLIB
"Build zlib from source"
WIN32 OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_TIFF
"Build libtiff from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_JASPER
"Build libjasper from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_JPEG
"Build libjpeg from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_PNG
"Build libpng from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_OPENEXR
"Build openexr from source"
WIN32 OR ANDROID OR APPLE OR CARMA
)
OCV_OPTION
(
BUILD_TBB
"Download and build TBB from source"
ANDROID IF CMAKE_COMPILER_IS_GNUCXX
)
# OpenCV installation options
# ===================================================
...
...
cmake/OpenCVDetectTBB.cmake
浏览文件 @
7882aba7
if
(
ANDROID AND NOT MIPS
)
if
(
BUILD_TBB
)
add_subdirectory
(
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/tbb"
)
include_directories
(
SYSTEM
${
TBB_INCLUDE_DIRS
}
)
set
(
OPENCV_LINKER_LIBS
${
OPENCV_LINKER_LIBS
}
tbb
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录