Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
7882aba7
Commit
7882aba7
authored
Jan 10, 2013
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TBB download and build option enabled for non Android platfroms.
parent
2e2e1355
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
15 deletions
+24
-15
CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
+16
-7
CMakeLists.txt
CMakeLists.txt
+7
-7
OpenCVDetectTBB.cmake
cmake/OpenCVDetectTBB.cmake
+1
-1
No files found.
3rdparty/tbb/CMakeLists.txt
View file @
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
View file @
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
View file @
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment