Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1090 from asmorkalov:android_tbb_downgrade

Browse Source
pull/1091/merge
Roman Donchenko 12 years ago committed by OpenCV Buildbot
parent a2d576c1bb c2e6668414
commit ec1df9f54d
1 changed files with 17 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      3rdparty/tbb/CMakeLists.txt

25
3rdparty/tbb/CMakeLists.txt vendored
Unescape View File

@ -5,14 +5,23 @@ 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!") message(FATAL_ERROR "BUILD_TBB option supports Windows on ARM only!\nUse regular official TBB build instead of the BUILD_TBB option!")
endif() endif()
# 4.1 update 4 - works fine if (WIN32 AND ARM)
set(tbb_ver "tbb41_20130613oss") # 4.1 update 4 - The first release that supports Windows RT. Hangs on some Android devices
set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130613oss_src.tgz") set(tbb_ver "tbb41_20130613oss")
set(tbb_md5 "108c8c1e481b0aaea61878289eb28b6a") set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130613oss_src.tgz")
set(tbb_version_file "version_string.ver") set(tbb_md5 "108c8c1e481b0aaea61878289eb28b6a")
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused-parameter) set(tbb_version_file "version_string.ver")
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused-parameter)
# 4.1 update 3 dev - works fine 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_ver "tbb41_20130401oss")
#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130401oss_src.tgz") #set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130401oss_src.tgz")
#set(tbb_md5 "f2f591a0d2ca8f801e221ce7d9ea84bb") #set(tbb_md5 "f2f591a0d2ca8f801e221ce7d9ea84bb")

Write Preview
Loading…
Cancel
Save