mirror of
https://github.com/opencv/opencv.git
synced 2024-11-24 03:00:14 +08:00
e845184843
* #1538 from StevenPuttemans:bugfix_3283 * #1545 from alalek:ocl_test_fix_rng * #1551 from alalek:cmake_install_win * #1570 from ilya-lavrenov:ipp_warn_fix * #1573 from alalek:perf_simple_strategy * #1574 from alalek:svm_workaround * #1576 from alalek:ocl_fix_cl_double * #1577 from ilya-lavrenov:ocl_setto_opencl12 * #1578 from asmorkalov:android_fd_cp_fix * #1579 from ilya-lavrenov:ocl_norm * #1582 from sperrholz:ocl-arithm-additions * #1586 from ilya-lavrenov:ocl_setto_win_fix * #1589 from ilya-lavrenov:pr1582_fix * #1591 from alalek:ocl_remove_cl_hpp_h * #1592 from alalek:ocl_program_cache_update * #1593 from ilya-lavrenov:ocl_war_on_double * #1594 from ilya-lavrenov:ocl_perf * #1595 from alalek:cl_code_cleanup * #1596 from alalek:test_fix_run_py * #1597 from alalek:ocl_fix_cleanup * #1598 from alalek:ocl_fix_build_mac * #1599 from ilya-lavrenov:ocl_mac_kernel_warnings * #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse * #1602 from alalek:ocl_test_dump_info * #1603 from ilya-lavrenov:ocl_disable_svm_noblas * #1605 from alalek:ocl_fixes * #1606 from ilya-lavrenov:ocl_imgproc * #1607 from ilya-lavrenov:ocl_fft_cleanup * #1608 from alalek:fix_warn_upd_haar * #1609 from ilya-lavrenov:ocl_some_optimization * #1610 from alalek:ocl_fix_perf_kalman * #1612 from alalek:ocl_fix_string_info * #1614 from ilya-lavrenov:ocl_svm_misprint * #1616 from ilya-lavrenov:ocl_cvtColor * #1617 from ilya-lavrenov:ocl_info * #1622 from a0byte:2.4 * #1625 from ilya-lavrenov:to_string Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVDetectPython.cmake cmake/OpenCVGenConfig.cmake modules/core/CMakeLists.txt modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/perf/main.cpp modules/ocl/src/arithm.cpp modules/ocl/src/cl_operations.cpp modules/ocl/src/cl_programcache.cpp modules/ocl/src/color.cpp modules/ocl/src/fft.cpp modules/ocl/src/filtering.cpp modules/ocl/src/gemm.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/matrix_operations.cpp modules/ocl/src/pyrlk.cpp modules/ocl/src/split_merge.cpp modules/ocl/src/svm.cpp modules/ocl/test/main.cpp modules/ocl/test/test_fft.cpp modules/ocl/test/test_moments.cpp modules/ocl/test/test_objdetect.cpp modules/ocl/test/test_optflow.cpp modules/ocl/test/utility.hpp modules/python/CMakeLists.txt modules/ts/include/opencv2/ts.hpp modules/ts/src/ts_perf.cpp samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
242 lines
9.5 KiB
CMake
242 lines
9.5 KiB
CMake
#Cross compile TBB from source
|
|
project(tbb)
|
|
|
|
if (WIN32 AND NOT ARM)
|
|
message(FATAL_ERROR "BUILD_TBB option supports Windows on ARM only!\nUse regular official TBB build instead of the BUILD_TBB option!")
|
|
endif()
|
|
|
|
if (WIN32 AND ARM)
|
|
# 4.1 update 4 - The first release that supports Windows RT. Hangs on some Android devices
|
|
set(tbb_ver "tbb41_20130613oss")
|
|
set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130613oss_src.tgz")
|
|
set(tbb_md5 "108c8c1e481b0aaea61878289eb28b6a")
|
|
set(tbb_version_file "version_string.ver")
|
|
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4702)
|
|
else()
|
|
# 4.1 update 2 - works fine
|
|
set(tbb_ver "tbb41_20130116oss")
|
|
set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130116oss_src.tgz")
|
|
set(tbb_md5 "3809790e1001a1b32d59c9fee590ee85")
|
|
set(tbb_version_file "version_string.ver")
|
|
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
|
|
endif()
|
|
|
|
# 4.1 update 3 dev - Hangs on some Android devices
|
|
#set(tbb_ver "tbb41_20130401oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130401oss_src.tgz")
|
|
#set(tbb_md5 "f2f591a0d2ca8f801e221ce7d9ea84bb")
|
|
#set(tbb_version_file "version_string.ver")
|
|
#ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
|
|
|
|
# 4.1 update 2 - works fine
|
|
#set(tbb_ver "tbb41_20130116oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130116oss_src.tgz")
|
|
#set(tbb_md5 "3809790e1001a1b32d59c9fee590ee85")
|
|
#set(tbb_version_file "version_string.ver")
|
|
#ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
|
|
|
|
# 4.1 update 1 - works fine
|
|
#set(tbb_ver "tbb41_20121003oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20121003oss_src.tgz")
|
|
#set(tbb_md5 "2a684fefb855d2d0318d1ef09afa75ff")
|
|
#set(tbb_version_file "version_string.ver")
|
|
|
|
# 4.1 - works fine
|
|
#set(tbb_ver "tbb41_20120718oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20120718oss_src.tgz")
|
|
#set(tbb_md5 "31b9ec300f3d09da2504d5d882788dd4")
|
|
#set(tbb_version_file "version_string.ver")
|
|
|
|
# 4.0 update 5 - works fine
|
|
#set(tbb_ver "tbb40_20120613oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb40_20120613oss_src.tgz")
|
|
#set(tbb_md5 "da01ed74944ec5950cfae3476901a172")
|
|
#set(tbb_version_file "version_string.ver")
|
|
|
|
# 4.0 update 4 - works fine
|
|
#set(tbb_ver "tbb40_20120408oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb40_20120408oss_src.tgz")
|
|
#set(tbb_md5 "734b356da7fe0ed308741f3e6018251e")
|
|
#set(tbb_version_file "version_string.ver")
|
|
|
|
# 4.0 update 3 - build broken
|
|
#set(tbb_ver "tbb40_20120201oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb40_20120201oss_src.tgz")
|
|
#set(tbb_md5 "4669e7d4adee018de7a7b8b972987218")
|
|
#set(tbb_version_file "version_string.tmp")
|
|
|
|
# 4.0 update 2 - works fine
|
|
#set(tbb_ver "tbb40_20111130oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb40_20111130oss_src.tgz")
|
|
#set(tbb_md5 "1e6926b21e865e79772119cd44fc3ad8")
|
|
#set(tbb_version_file "version_string.tmp")
|
|
#set(tbb_need_GENERIC_DWORD_LOAD_STORE TRUE)
|
|
|
|
# 4.0 update 1 - works fine
|
|
#set(tbb_ver "tbb40_20111003oss")
|
|
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb40_20111003oss_src.tgz")
|
|
#set(tbb_md5 "7b5d94eb35a563b29ef402e0fd8f15c9")
|
|
#set(tbb_version_file "version_string.tmp")
|
|
#set(tbb_need_GENERIC_DWORD_LOAD_STORE TRUE)
|
|
|
|
set(tbb_tarball "${CMAKE_CURRENT_SOURCE_DIR}/${tbb_ver}_src.tgz")
|
|
set(tbb_src_dir "${CMAKE_CURRENT_BINARY_DIR}/${tbb_ver}")
|
|
|
|
if(EXISTS "${tbb_tarball}")
|
|
file(MD5 "${tbb_tarball}" tbb_local_md5)
|
|
if(NOT tbb_local_md5 STREQUAL tbb_md5)
|
|
message(WARNING "Local copy of TBB source tarball has invalid MD5 hash: ${tbb_local_md5} (expected: ${tbb_md5})")
|
|
file(REMOVE "${tbb_tarball}")
|
|
if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${tbb_ver}")
|
|
file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/${tbb_ver}")
|
|
endif()
|
|
endif()
|
|
endif()
|
|
|
|
if(NOT EXISTS "${tbb_tarball}")
|
|
message(STATUS "Downloading ${tbb_ver}_src.tgz")
|
|
file(DOWNLOAD "${tbb_url}" "${tbb_tarball}" TIMEOUT 600 STATUS __statvar)
|
|
if(NOT __statvar EQUAL 0)
|
|
message(FATAL_ERROR "Failed to download TBB sources: ${tbb_url}")
|
|
endif()
|
|
file(MD5 "${tbb_tarball}" tbb_local_md5)
|
|
if(NOT tbb_local_md5 STREQUAL tbb_md5)
|
|
file(REMOVE "${tbb_tarball}")
|
|
message(FATAL_ERROR "Downloaded TBB source tarball has invalid MD5 hash: ${tbb_local_md5} (expected: ${tbb_md5})")
|
|
endif()
|
|
|
|
if(EXISTS "${tbb_src_dir}")
|
|
file(REMOVE_RECURSE "${tbb_src_dir}")
|
|
endif()
|
|
endif()
|
|
|
|
# untar TBB sources
|
|
if(NOT EXISTS "${tbb_src_dir}")
|
|
message(STATUS "Unpacking ${tbb_ver}_src.tgz to ${tbb_src_dir}")
|
|
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xz "${tbb_tarball}"
|
|
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
|
|
RESULT_VARIABLE tbb_untar_RESULT)
|
|
|
|
if(NOT tbb_untar_RESULT EQUAL 0 OR NOT EXISTS "${tbb_src_dir}")
|
|
message(FATAL_ERROR "Failed to unpack TBB sources from ${tbb_tarball} to ${tbb_src_dir} with error ${tbb_untar_RESULT}")
|
|
endif()
|
|
endif()
|
|
|
|
set(TBB_INCLUDE_DIRS "${tbb_src_dir}/include" PARENT_SCOPE)
|
|
|
|
ocv_include_directories("${tbb_src_dir}/include"
|
|
"${tbb_src_dir}/src/"
|
|
"${tbb_src_dir}/src/rml/include"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}")
|
|
|
|
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")
|
|
|
|
if (WIN32)
|
|
add_definitions(/D__TBB_DYNAMIC_LOAD_ENABLED=0
|
|
/D__TBB_BUILD=1
|
|
/DTBB_NO_LEGACY=1
|
|
/D_UNICODE
|
|
/DUNICODE
|
|
/DWINAPI_FAMILY=WINAPI_FAMILY_APP
|
|
/DDO_ITT_NOTIFY=0
|
|
/DUSE_WINTHREAD
|
|
) # defines were copied from windows.cl.inc
|
|
|
|
if (ARM)
|
|
add_definitions(/D_WIN32_WINNT=0x0602
|
|
/D__TBB_WIN32_USE_CL_BUILTINS
|
|
)
|
|
endif()
|
|
|
|
set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} /APPCONTAINER")
|
|
else()
|
|
add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0 #required
|
|
-D__TBB_BUILD=1 #required
|
|
-D__TBB_SURVIVE_THREAD_SWITCH=0 #no cilk support
|
|
-DTBB_USE_DEBUG=0 #just to be sure
|
|
-DTBB_NO_LEGACY=1 #don't need backward compatibility
|
|
-DDO_ITT_NOTIFY=0 #it seems that we don't need these notifications
|
|
)
|
|
endif()
|
|
|
|
if (HAVE_LIBPTHREAD)
|
|
add_definitions(-DUSE_PTHREAD) #required for Unix
|
|
endif()
|
|
|
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
|
add_definitions(-DTBB_USE_GCC_BUILTINS=1) #required for ARM GCC
|
|
endif()
|
|
|
|
if(ANDROID_COMPILER_IS_CLANG)
|
|
add_definitions(-D__TBB_GCC_BUILTIN_ATOMICS_PRESENT=1)
|
|
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wmissing-prototypes)
|
|
endif()
|
|
|
|
if(tbb_need_GENERIC_DWORD_LOAD_STORE)
|
|
#needed by TBB 4.0 update 1,2; fixed in TBB 4.0 update 3 but it has 2 new problems
|
|
add_definitions(-D__TBB_USE_GENERIC_DWORD_LOAD_STORE=1)
|
|
set(tbb_need_GENERIC_DWORD_LOAD_STORE ON PARENT_SCOPE)
|
|
endif()
|
|
|
|
set(TBB_SOURCE_FILES ${lib_srcs} ${lib_hdrs})
|
|
|
|
if (ARM AND NOT WIN32)
|
|
if (NOT ANDROID)
|
|
set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/arm_linux_stub.cpp")
|
|
endif()
|
|
set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/android_additional.h")
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include \"${CMAKE_CURRENT_SOURCE_DIR}/android_additional.h\"")
|
|
endif()
|
|
|
|
set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/${tbb_version_file}")
|
|
|
|
add_library(tbb ${TBB_SOURCE_FILES})
|
|
|
|
if (WIN32)
|
|
if (ARM)
|
|
set(platform_macro /D_M_ARM=1)
|
|
endif()
|
|
|
|
add_custom_command(TARGET tbb
|
|
PRE_BUILD
|
|
COMMAND ${CMAKE_C_COMPILER} /nologo /TC /EP ${tbb_src_dir}\\src\\tbb\\win32-tbb-export.def /DTBB_NO_LEGACY=1 /D_CRT_SECURE_NO_DEPRECATE /D__TBB_BUILD=1 ${platform_macro} /I${tbb_src_dir}\\src /I${tbb_src_dir}\\include > "${tbb_src_dir}\\src\\tbb\\tbb.def"
|
|
WORKING_DIRECTORY ${tbb_src_dir}\\src\\tbb
|
|
COMMENT "Generating tbb.def file" VERBATIM
|
|
)
|
|
|
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEF:${tbb_src_dir}/src/tbb/tbb.def /DLL /MAP /fixed:no /INCREMENTAL:NO")
|
|
else()
|
|
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}")
|
|
|
|
if (WIN32)
|
|
set(tbb_debug_postfix "_debug") # to fit pragmas in _windef.h inside TBB
|
|
else()
|
|
set(tbb_debug_postfix ${OPENCV_DEBUG_POSTFIX})
|
|
endif()
|
|
|
|
set_target_properties(tbb
|
|
PROPERTIES OUTPUT_NAME tbb
|
|
DEBUG_POSTFIX "${tbb_debug_postfix}"
|
|
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
|
|
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
|
|
)
|
|
|
|
if(ENABLE_SOLUTION_FOLDERS)
|
|
set_target_properties(tbb PROPERTIES FOLDER "3rdparty")
|
|
endif()
|
|
|
|
install(TARGETS tbb EXPORT OpenCVModules
|
|
RUNTIME DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT main
|
|
LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
|
|
ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT main
|
|
)
|
|
|
|
# get TBB version
|
|
ocv_parse_header("${tbb_src_dir}/include/tbb/tbb_stddef.h" TBB_VERSION_LINES TBB_VERSION_MAJOR TBB_VERSION_MINOR TBB_INTERFACE_VERSION CACHE)
|