mirror of https://github.com/microsoft/vcpkg.git
[tbb] Update to 2023.0.0 (#52478)
This commit is contained in:
parent
341432707e
commit
46d21b7133
|
|
@ -5,7 +5,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO oneapi-src/oneTBB
|
||||
REF "v${VERSION}"
|
||||
SHA512 fdc50589785b1949ca1dd4429bbcedb180be4b8966da5243ddd1f8e9f97310dd603681e0bb83c1d6c2d3e27932f577ef6739e4e82f3c54af147f4d6d906b39f1
|
||||
SHA512 7db4a41e3b0e34a559299451f7eef633190e7e4be1819f609f773ac6b7f3d31ff5e45f3cfabd3606e280adb930d47a77a31377e5ef72c85dcb37a354d8b87e55
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "tbb",
|
||||
"version": "2022.3.0",
|
||||
"version": "2023.0.0",
|
||||
"description": "Intel's Threading Building Blocks.",
|
||||
"homepage": "https://github.com/oneapi-src/oneTBB",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
diff --git a/pxr/base/work/workTBB/dispatcher_impl.h b/pxr/base/work/workTBB/dispatcher_impl.h
|
||||
index 9cecf4a4d..6785dcec6 100644
|
||||
--- a/pxr/base/work/workTBB/dispatcher_impl.h
|
||||
+++ b/pxr/base/work/workTBB/dispatcher_impl.h
|
||||
@@ -10,6 +10,18 @@
|
||||
#include "pxr/pxr.h"
|
||||
#include "pxr/base/work/api.h"
|
||||
|
||||
+// The TBB version macro is located in different headers in legacy TBB
|
||||
+// (tbb/tbb_stddef.h) and oneTBB (tbb/version.h)
|
||||
+#if __has_include(<tbb/tbb_stddef.h>)
|
||||
+#include <tbb/tbb_stddef.h>
|
||||
+#elif __has_include(<tbb/version.h>)
|
||||
+#include <tbb/version.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifndef TBB_INTERFACE_VERSION_MAJOR
|
||||
+#error "TBB version macro TBB_INTERFACE_VERSION_MAJOR not found"
|
||||
+#endif
|
||||
+
|
||||
// Blocked range is not used in this file, but this header happens to pull in
|
||||
// the TBB version header in a way that works in all TBB versions.
|
||||
#include <tbb/blocked_range.h>
|
||||
|
|
@ -29,6 +29,7 @@ vcpkg_from_github(
|
|||
008-fix_clang8_compiler_error.patch
|
||||
009-vcpkg_install_folder_conventions.patch
|
||||
010-cmake_export_plugin_as_modules.patch
|
||||
011-fix-tbb2023-task-api.patch
|
||||
)
|
||||
|
||||
# Changes accompanying 003-fix-dep.patch
|
||||
|
|
@ -70,6 +71,7 @@ vcpkg_cmake_configure(
|
|||
-DPXR_ENABLE_PYTHON_SUPPORT:BOOL=OFF
|
||||
-DPXR_USE_DEBUG_PYTHON:BOOL=OFF
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
PXR_ENABLE_PTEX_SUPPORT
|
||||
PXR_USE_PYTHON_3
|
||||
PYTHON_EXECUTABLE
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "usd",
|
||||
"version": "26.5",
|
||||
"port-version": 1,
|
||||
"description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.",
|
||||
"homepage": "https://github.com/PixarAnimationStudios/OpenUSD",
|
||||
"license": null,
|
||||
|
|
|
|||
|
|
@ -9993,7 +9993,7 @@
|
|||
"port-version": 1
|
||||
},
|
||||
"tbb": {
|
||||
"baseline": "2022.3.0",
|
||||
"baseline": "2023.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"tcb-span": {
|
||||
|
|
@ -10490,7 +10490,7 @@
|
|||
},
|
||||
"usd": {
|
||||
"baseline": "26.5",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"usearch": {
|
||||
"baseline": "2.25.3",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "385672e31588c1e42f8c07a59ae9902d2872c27f",
|
||||
"version": "2023.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "0bfeb03aff5ecb38ea25dbedcfa9d2ea21791b82",
|
||||
"version": "2022.3.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0292e6ee6d054866a39a60a931bc94e5f3dc238e",
|
||||
"version": "26.5",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "74916c26d54242a3b610bfe7059bfad0d454f717",
|
||||
"version": "26.5",
|
||||
|
|
|
|||
Loading…
Reference in New Issue