diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2020-12-30 01:00:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 16:00:55 -0800 |
| commit | fc0a2aa44b7037ba824f4528cce0fc19b2e07914 (patch) | |
| tree | 725b8e3b590638471bb08130a04792c3b0def182 | |
| parent | 7019243b24ed5d3fd303f9d20b35e5d7301cb1f2 (diff) | |
| download | vcpkg-fc0a2aa44b7037ba824f4528cce0fc19b2e07914.tar.gz vcpkg-fc0a2aa44b7037ba824f4528cce0fc19b2e07914.zip | |
[tbb] arm64-osx support (#15306)
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
| -rw-r--r-- | ports/tbb/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ports/tbb/CONTROL | 4 | ||||
| -rw-r--r-- | ports/tbb/portfile.cmake | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt index 3094a4102..ae53c40f2 100644 --- a/ports/tbb/CMakeLists.txt +++ b/ports/tbb/CMakeLists.txt @@ -9,6 +9,9 @@ if(NOT BUILD_SHARED_LIBS) endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(FORWARD_SDK_ROOT "SDKROOT=${CMAKE_OSX_SYSROOT}")
+ if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+ set(arch "arch=arm64")
+ endif()
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 5eb978f3a..611e074b7 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,6 +1,6 @@ Source: tbb Version: 2020_U3 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. -Supports: !(uwp|arm|arm64) | linux +Supports: !(uwp|arm|arm64) | linux | osx diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 5950bd710..0bea15bf0 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,4 +1,4 @@ -if (NOT VCPKG_TARGET_IS_LINUX) +if (NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") endif() |