diff options
| author | zhihaoy <43971430+zhihaoy@users.noreply.github.com> | 2019-02-26 12:45:45 -0600 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-26 10:45:45 -0800 |
| commit | d96b4628238e6df39e7c30985e0fa85844d667df (patch) | |
| tree | 2dd98f30f35a5892c0a0f5c4ca6f5f3879bd5182 | |
| parent | 5251a51ab0b67176755542e6e85a5cb96e2f3524 (diff) | |
| download | vcpkg-d96b4628238e6df39e7c30985e0fa85844d667df.tar.gz vcpkg-d96b4628238e6df39e7c30985e0fa85844d667df.zip | |
[tbb] Build dll for static dependency on Windows (#5430)
* [tbb] Build dll for static dependency on Windows
| -rw-r--r-- | ports/tbb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tbb/portfile.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 94126c5e7..22956077e 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 09398ae92..14d70deb5 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( |