mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 11:58:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[tbb] added Android as supported platform (#31738)

Browse Source 
* [tbb] added Android support

* updated version files

* [usd] turned off Android support

* updated versions files
This commit is contained in:
Ilya Lavrenov 2023-06-06 01:01:15 +04:00 committed by GitHub
parent 1bc0cf857d
commit cc968d00bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/tbb/portfile.cmake
View File

@ -24,18 +24,16 @@ vcpkg_cmake_configure(
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TBB") vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TBB")
vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
set(arch_suffix "")
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
set(arch_suffix "32")
endif()
if(NOT VCPKG_BUILD_TYPE) if(NOT VCPKG_BUILD_TYPE)
if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|arm|wasm32)$")
set(arch_suffix "32")
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug")
unset(arch_suffix)
endif() endif()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/doc"

4
ports/tbb/vcpkg.json
View File

@ -2,11 +2,11 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "tbb", "name": "tbb",
"version": "2021.9.0", "version": "2021.9.0",
"port-version": 1, "port-version": 2,
"description": "Intel's Threading Building Blocks.", "description": "Intel's Threading Building Blocks.",
"homepage": "https://github.com/oneapi-src/oneTBB", "homepage": "https://github.com/oneapi-src/oneTBB",
"license": "Apache-2.0", "license": "Apache-2.0",
"supports": "(windows & !uwp) | linux | osx | ios", "supports": "(windows & !uwp) | linux | osx | ios | android",
"dependencies": [ "dependencies": [
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",

3
ports/usd/vcpkg.json
View File

@ -1,10 +1,11 @@
{ {
"name": "usd", "name": "usd",
"version": "23.5", "version": "23.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.", "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/USD", "homepage": "https://github.com/PixarAnimationStudios/USD",
"license": null, "license": null,
"supports": "!x86 & !arm", "supports": "!x86 & !arm & !android",
"dependencies": [ "dependencies": [
"boost-assign", "boost-assign",
"boost-crc", "boost-crc",

4
versions/baseline.json
View File

@ -7890,7 +7890,7 @@
}, },
"tbb": { "tbb": {
"baseline": "2021.9.0", "baseline": "2021.9.0",
"port-version": 1 "port-version": 2
}, },
"tcb-span": { "tcb-span": {
"baseline": "2021-12-15", "baseline": "2021-12-15",
@ -8282,7 +8282,7 @@
}, },
"usd": { "usd": {
"baseline": "23.5", "baseline": "23.5",
"port-version": 0 "port-version": 1
}, },
"usockets": { "usockets": {
"baseline": "0.8.6", "baseline": "0.8.6",

5
versions/t-/tbb.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "d050b3a84687479bb03134f98f6360bfb72e64a8",
"version": "2021.9.0",
"port-version": 2
},
{ {
"git-tree": "97a86c92ba0419c50673782f0b3a7f1568aaaef7", "git-tree": "97a86c92ba0419c50673782f0b3a7f1568aaaef7",
"version": "2021.9.0", "version": "2021.9.0",

5
versions/u-/usd.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "cfe836715c8cf43db76006deffa234cecf77745c",
"version": "23.5",
"port-version": 1
},
{ {
"git-tree": "5a5cb56688d1804bb35d8e361cfd41ef858919c9", "git-tree": "5a5cb56688d1804bb35d8e361cfd41ef858919c9",
"version": "23.5", "version": "23.5",