From b712bbe9a5d7e467fc724684a610bdeb2696ebcd Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Thu, 5 Jul 2012 09:22:52 +0000 Subject: [PATCH] Android: updated default TBB version to 4.0 update 5 --- 3rdparty/tbb/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/3rdparty/tbb/CMakeLists.txt b/3rdparty/tbb/CMakeLists.txt index cf26ff02d..c89b9a3ef 100644 --- a/3rdparty/tbb/CMakeLists.txt +++ b/3rdparty/tbb/CMakeLists.txt @@ -5,12 +5,18 @@ endif() project(tbb) -# 4.0 update 4 - works fine -set(tbb_ver "tbb40_20120408oss") -set(tbb_url "http://threadingbuildingblocks.org/uploads/77/185/4.0%20update%204/tbb40_20120408oss_src.tgz") -set(tbb_md5 "734b356da7fe0ed308741f3e6018251e") +# 4.0 update 5 - works fine +set(tbb_ver "tbb40_20120613oss") +set(tbb_url "http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/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/uploads/77/185/4.0%20update%204/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/uploads/77/182/4.0%20update%203/tbb40_20120201oss_src.tgz")