mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 04:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[tbb] Fix linux pkgconfig (#33087)

Browse Source 
Co-authored-by: Jim wang (BEYONDSOFT CONSULTING INC) <v-wangjim@microsoft.com>
This commit is contained in:
moritz-h 2023-08-18 21:26:31 +02:00 committed by GitHub
parent 7d7c9c66de
commit c95000e1b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/tbb/portfile.cmake
View File

@ -30,7 +30,11 @@ if(NOT VCPKG_BUILD_TYPE)
if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|arm|wasm32)$") if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|arm|wasm32)$")
set(arch_suffix "32") set(arch_suffix "32")
endif() endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug") if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug")
else()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb" "-ltbb_debug")
endif()
unset(arch_suffix) unset(arch_suffix)
endif() endif()
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()

1
ports/tbb/vcpkg.json
View File

@ -2,6 +2,7 @@
"$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.10.0", "version": "2021.10.0",
"port-version": 1,
"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",

2
versions/baseline.json
View File

@ -8034,7 +8034,7 @@
}, },
"tbb": { "tbb": {
"baseline": "2021.10.0", "baseline": "2021.10.0",
"port-version": 0 "port-version": 1
}, },
"tcb-span": { "tcb-span": {
"baseline": "2022-06-15", "baseline": "2022-06-15",

5
versions/t-/tbb.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "e8bd03cdf65a8793c09146f67f942afa941c68a0",
"version": "2021.10.0",
"port-version": 1
},
{ {
"git-tree": "117288ebe187535733fd627985c192553c7b82e6", "git-tree": "117288ebe187535733fd627985c192553c7b82e6",
"version": "2021.10.0", "version": "2021.10.0",