diff options
| author | xyb <xyb@xyb.name> | 2020-11-03 23:00:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 23:00:54 -0800 |
| commit | 5c36967f365db6daf07a6e3d192814f6b9d6104c (patch) | |
| tree | fcce1ac080c74c7b2ebb7cb59067bb2644c25de0 | |
| parent | 63dccf771d0bf84f8a1e111c8b53a4057d4c0a18 (diff) | |
| download | vcpkg-5c36967f365db6daf07a6e3d192814f6b9d6104c.tar.gz vcpkg-5c36967f365db6daf07a6e3d192814f6b9d6104c.zip | |
[tbb] Support tbb build for arm-linux & arm64-linux (#14325)
| -rw-r--r-- | ports/tbb/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | ports/tbb/CONTROL | 3 | ||||
| -rw-r--r-- | ports/tbb/portfile.cmake | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt index 6d41b1555..3094a4102 100644 --- a/ports/tbb/CMakeLists.txt +++ b/ports/tbb/CMakeLists.txt @@ -11,7 +11,19 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(FORWARD_SDK_ROOT "SDKROOT=${CMAKE_OSX_SYSROOT}")
endif()
-tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT})
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR)
+ set(arch "arch=${CMAKE_SYSTEM_PROCESSOR}")
+ if(CMAKE_CXX_COMPILER)
+ set(CPLUS "CPLUS=${CMAKE_CXX_COMPILER}")
+ endif()
+ if(CMAKE_C_COMPILER)
+ set(CONLY "CONLY=${CMAKE_C_COMPILER}")
+ endif()
+ endif()
+endif()
+
+tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT})
set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 1dcf79011..565b4a564 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,5 +1,6 @@ Source: tbb Version: 2020_U3 +Port-Version: 1 Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. -Supports: !(uwp|arm|arm64)
\ No newline at end of file +Supports: !(uwp|arm|arm64) | linux
\ No newline at end of file diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 38e8cb735..2e54a53a0 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") +if (NOT VCPKG_TARGET_IS_LINUX) + vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH |