aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/tbb/CONTROL2
-rw-r--r--ports/tbb/portfile.cmake5
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(