diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 54550310b4..595eca8140 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -30,7 +30,11 @@ 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") + 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) endif() vcpkg_fixup_pkgconfig() diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index d8d158b2e3..646fb35494 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", "version": "2021.10.0", + "port-version": 1, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1ccc8489c7..e5b2a7a21f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8034,7 +8034,7 @@ }, "tbb": { "baseline": "2021.10.0", - "port-version": 0 + "port-version": 1 }, "tcb-span": { "baseline": "2022-06-15", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 4ce5e4476c..388d7230be 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8bd03cdf65a8793c09146f67f942afa941c68a0", + "version": "2021.10.0", + "port-version": 1 + }, { "git-tree": "117288ebe187535733fd627985c192553c7b82e6", "version": "2021.10.0",