mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
9b61080abc
Fix one of https://github.com/microsoft/vcpkg/issues/32398 issue.
When install opensubdiv[core,tbb]:x64-windows and
opensubdiv[core,tbb]:x64-linux will get this error:
````
FAILED: opensubdiv/osd/CMakeFiles/osd_cpu_obj.dir/tbbEvaluator.cpp.obj
C:\PROGRA~1\MIB055~1\2022\COMMUN~1\VC\Tools\MSVC\1439~1.335\bin\Hostx64\x64\cl.exe /TP -DNOMINMAX -DOPENSUBDIV_HAS_TBB -DOPENSUBDIV_VERSION_STRING=\"3.5.0\" -DTBB_USE_DEBUG -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES -IF:\test\vcpkg\buildtrees\opensubdiv\src\a0796b160c-fe5b1b6d5d\opensubdiv -IF:\test\vcpkg\buildtrees\opensubdiv\x64-windows-dbg\opensubdiv\osd -external:IF:\test\vcpkg\installed\x64-windows\include -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /Wall /W3 /wd4005 /wd4350 /wd4548 /showIncludes /Foopensubdiv\osd\CMakeFiles\osd_cpu_obj.dir\tbbEvaluator.cpp.obj /Fdopensubdiv\osd\CMakeFiles\osd_cpu_obj.dir\ /FS -c F:\test\vcpkg\buildtrees\opensubdiv\src\a0796b160c-fe5b1b6d5d\opensubdiv\osd\tbbEvaluator.cpp
F:\test\vcpkg\buildtrees\opensubdiv\src\a0796b160c-fe5b1b6d5d\opensubdiv\osd\tbbEvaluator.cpp(28): fatal error C1083: Cannot open include file: 'tbb/task_scheduler_init.h': No such file or directory
````
Because the task_scheduler_init.h header file no longer exists in the
latest
[Tbb](https://github.com/oneapi-src/oneTBB/tree/master/include/tbb)
file, I refer to the
[upstream](7d0ab5530f/opensubdiv/osd/tbbEvaluator.cpp (L30))
modification to add judgment conditions to ensure that the old version
is available.
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [ ] ~~SHA512s are updated for each updated download.~~
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [ ] ~~Any patches that are no longer applied are deleted from the
port's directory.~~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
---------
Co-authored-by: Jon <v-zhli17@microsoft.com>
50 lines
1.2 KiB
JSON
50 lines
1.2 KiB
JSON
{
|
|
"versions": [
|
|
{
|
|
"git-tree": "8d12fbded4ab0667d082362ae4b6f57506926c9b",
|
|
"version-semver": "3.5.0",
|
|
"port-version": 2
|
|
},
|
|
{
|
|
"git-tree": "8cc627798709caed394f31456098644f359f0936",
|
|
"version-semver": "3.5.0",
|
|
"port-version": 1
|
|
},
|
|
{
|
|
"git-tree": "38f4d0720a8f9f0610f327382977951421d3ce98",
|
|
"version-semver": "3.5.0",
|
|
"port-version": 0
|
|
},
|
|
{
|
|
"git-tree": "a2aebb443eae8d15fc85fbeb0ffdb3774b1b09c8",
|
|
"version-semver": "3.4.3",
|
|
"port-version": 5
|
|
},
|
|
{
|
|
"git-tree": "91fabcb273d865674e59979585b5f9a6739ad6c5",
|
|
"version-semver": "3.4.3",
|
|
"port-version": 4
|
|
},
|
|
{
|
|
"git-tree": "786a994b5a4637b9cd43eaf2b790d913bce9cdce",
|
|
"version-semver": "3.4.3",
|
|
"port-version": 3
|
|
},
|
|
{
|
|
"git-tree": "a8158645b04f25a236cd3fdf2debc67b10cfd945",
|
|
"version-semver": "3.4.3",
|
|
"port-version": 2
|
|
},
|
|
{
|
|
"git-tree": "2ca1bb01f46ea1e8d94d453dfc9e535a8bb220b0",
|
|
"version-semver": "3.4.3",
|
|
"port-version": 1
|
|
},
|
|
{
|
|
"git-tree": "306ae6eba55d7f3300c17c8c7a88ea6d648e2b69",
|
|
"version-string": "3.4.3",
|
|
"port-version": 0
|
|
}
|
|
]
|
|
}
|