mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 03:00:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake scripts changed a bit: added more accurate variant of the Threading Framework support (it is a lightweight analogue of TBB for ARM-s).

Browse Source
This commit is contained in:
Leonid Beynenson 2011-09-27 16:25:13 +00:00
parent f0759437c0
commit fcaa587b67
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -446,6 +446,7 @@ if(IOS)
endif() endif()
set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support") set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
set(WITH_THREADING_FRAMEWORK OFF CACHE BOOL "Include Threading Framework support (lightweight analogue of TBB for ARM-s)")
set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support") set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support") set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
@ -957,12 +958,17 @@ if (WITH_TBB)
endif(WITH_TBB) endif(WITH_TBB)
#Threading Framework -- temporary decision for ARM-s instead of TBB #Threading Framework -- temporary decision for ARM-s instead of TBB
if (NOT HAVE_TBB) set(HAVE_THREADING_FRAMEWORK)
if (NOT HAVE_TBB AND WITH_THREADING_FRAMEWORK)
file(GLOB THREADING_FRAMEWORK_HEADER "${OpenCV_SOURCE_DIR}/modules/core/include/opencv2/core/threading_framework.hpp") file(GLOB THREADING_FRAMEWORK_HEADER "${OpenCV_SOURCE_DIR}/modules/core/include/opencv2/core/threading_framework.hpp")
file(GLOB THREADING_FRAMEWORK_SOURCE "${OpenCV_SOURCE_DIR}/modules/core/src/threading_framework.cpp") file(GLOB THREADING_FRAMEWORK_SOURCE "${OpenCV_SOURCE_DIR}/modules/core/src/threading_framework.cpp")
if(THREADING_FRAMEWORK_HEADER AND THREADING_FRAMEWORK_SOURCE) if(THREADING_FRAMEWORK_HEADER AND THREADING_FRAMEWORK_SOURCE)
set(HAVE_THREADING_FRAMEWORK 1) set(HAVE_THREADING_FRAMEWORK 1)
endif() endif()
if (TEGRA_DIR)
set(HAVE_THREADING_FRAMEWORK 1)
endif()
endif() endif()
############################ Intel IPP ############################# ############################ Intel IPP #############################

2
modules/core/include/opencv2/core/internal.hpp
View File

@ -200,7 +200,7 @@ CV_INLINE IppiSize ippiSize(int width, int height)
#ifdef HAVE_THREADING_FRAMEWORK #ifdef HAVE_THREADING_FRAMEWORK
#include "threading_framework.hpp" #include "opencv2/core/threading_framework.hpp"
template<typename Body> template<typename Body>
static void parallel_for( const BlockedRange& range, const Body& body ) static void parallel_for( const BlockedRange& range, const Body& body )