aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2020-03-23 12:07:13 +0800
committerGitHub <noreply@github.com>2020-03-22 21:07:13 -0700
commit97302ca1729eac9917c8a8977667601453795c90 (patch)
tree975cc079fff430fa321b83e2324b5f4147e11971
parenta5a244f5bdc390fc1c3d42e126e0bfd80541f060 (diff)
downloadvcpkg-97302ca1729eac9917c8a8977667601453795c90.tar.gz
vcpkg-97302ca1729eac9917c8a8977667601453795c90.zip
[tbb] Update to new repository (#10456)
* [tbb] Update the repository * Update version
-rw-r--r--ports/tbb/CONTROL3
-rw-r--r--ports/tbb/portfile.cmake6
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index 6f45ecf76..57ca68987 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,4 +1,5 @@
Source: tbb
-Version: 2020_U1
+Version: 2020_U1-1
Homepage: https://github.com/01org/tbb
Description: Intel's Threading Building Blocks.
+Supports: !(uwp|arm|arm64) \ No newline at end of file
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 7a774f5a2..78dab2e3d 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -1,8 +1,10 @@
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp")
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- REPO intel/tbb
+ REPO oneapi-src/oneTBB
REF 427c252e0bb9e191767a62d8a744b21950c343f6 # 2020_U1
- SHA512 b61107a751363f6acbf31297fc1232314a41622d6e89fe87dedb34a11c9a1d04dd1be724e7a6021e889342e7a453b6605523560441460716933817dffd4a4191
+ SHA512 01307b689680c8d796357a65258257b0c54336aa2a5dc75746d65e169988b8cb353537ad480cc4b8970b32667ab7f965bfedee4a15186f2a3159c9f130667f26
HEAD_REF tbb_2019
PATCHES
fix-static-build.patch