From 6a112aa87ae3a12dd13e2dfc9263ed4dcdf82f7d Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Thu, 6 Sep 2012 19:38:13 +0400 Subject: [PATCH] Use TBB 4.1 on Android --- 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 c89b9a3ef6..bf91f4d8b8 100644 --- a/3rdparty/tbb/CMakeLists.txt +++ b/3rdparty/tbb/CMakeLists.txt @@ -5,12 +5,18 @@ endif() project(tbb) -# 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") +# 4.1 - works fine +set(tbb_ver "tbb41_20120718oss") +set(tbb_url "http://threadingbuildingblocks.org/uploads/77/188/4.1/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/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")