From d96b4628238e6df39e7c30985e0fa85844d667df Mon Sep 17 00:00:00 2001 From: zhihaoy <43971430+zhihaoy@users.noreply.github.com> Date: Tue, 26 Feb 2019 12:45:45 -0600 Subject: [PATCH] [tbb] Build dll for static dependency on Windows (#5430) * [tbb] Build dll for static dependency on Windows --- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 94126c5e758..22956077eae 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2019_U3 +Version: 2019_U3-1 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 09398ae9235..14d70deb5d5 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,7 +1,10 @@ include(vcpkg_common_functions) if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message("tbb only supports dynamic library linkage") + set(VCPKG_LIBRARY_LINKAGE "dynamic") + endif() endif() vcpkg_from_github(