aboutsummaryrefslogtreecommitdiff
path: root/ports/tbb
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-04-02 16:53:20 -0700
committerVictor Romero <romerosanchezv@gmail.com>2019-04-02 16:53:20 -0700
commit9596fe7dd72179045cd9460730a71e197e82b1c2 (patch)
treec27ae77fe5a646686bbf72f910416dfbb2af9e0b /ports/tbb
parentf41cc7b47cd0e846e047891b605f6870cc598ccb (diff)
parent0fffb47ed02507aeacc29c64d91e9d4639f981f6 (diff)
downloadvcpkg-9596fe7dd72179045cd9460730a71e197e82b1c2.tar.gz
vcpkg-9596fe7dd72179045cd9460730a71e197e82b1c2.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into pr/cmake_3_14
Diffstat (limited to 'ports/tbb')
-rw-r--r--ports/tbb/CONTROL2
-rw-r--r--ports/tbb/portfile.cmake7
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index 22956077e..496c8c20f 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
Source: tbb
-Version: 2019_U3-1
+Version: 2019_U4
Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 14d70deb5..3050a38a9 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -10,9 +10,9 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO 01org/tbb
- REF 2019_U3
- SHA512 b6eaaea95658c4d49e6894811eb9ca38541820462bf1b606db16ca697af4329a94627d8ae01a73f2b07567280865b3ea92ca0ce091fa95dd3551cebbdd35976d
- HEAD_REF tbb_2018
+ REF 2019_U4
+ SHA512 f8ba92663c822e36f68f2b1837aa66d4fc285abe8c0c9b501f6cc31d3186d39b193588e49988e488beb9d400a1c3aa3fe72580f428e7ceca3581e649f28ae59e
+ HEAD_REF tbb_2019
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -87,3 +87,4 @@ file(COPY ${SOURCE_PATH}/LICENSE ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${C
file(RENAME ${CURRENT_PACKAGES_DIR}/share/tbb/LICENSE ${CURRENT_PACKAGES_DIR}/share/tbb/copyright)
vcpkg_test_cmake(PACKAGE_NAME TBB)
+#