Skip to content

Commit

Permalink
Merge pull request opencv#6721 from alalek:tbb_update
Browse files Browse the repository at this point in the history
  • Loading branch information
@alalek
alalek committed Jun 24, 2016
2 parents 0ebe387 + eaec95d commit 0e436c3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions 3rdparty/tbb/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ 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()

set(tbb_ver "tbb43_20141204oss")
set(tbb_url "http://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb43_20141204oss_src.tgz")
set(tbb_md5 "e903dd92d9433701f097fa7ca29a3c1f")
set(tbb_ver "tbb44_20160128oss")
set(tbb_url "http://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160128oss_src_0.tgz")
set(tbb_md5 "9d8a4cdf43496f1b3f7c473a5248e5cc")
set(tbb_version_file "version_string.ver")
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4702)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
Expand Down

0 comments on commit 0e436c3

Please sign in to comment.