mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 13:03:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

tbb: Fix compilation on OSX (#8744)

Browse Source 
* tbb: Fix compilation on OSX

Make sure CMake detected sysroot is correctly forwarded to TBB build
system so system headers files will be found later on.

* tbb: Version bump
This commit is contained in:
tarcila 2019-11-01 16:46:49 -04:00 committed by Victor Romero
parent 38570e216e
commit 84bafa656b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/tbb/CMakeLists.txt
View File

@ -7,7 +7,11 @@ include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED)
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc) set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc)
endif() endif()
tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${TBB_STATIC_INCLUDE}) 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})
set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir) set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir)
if(CMAKE_BUILD_TYPE STREQUAL "Release") if(CMAKE_BUILD_TYPE STREQUAL "Release")

2
ports/tbb/CONTROL
View File

@ -1,4 +1,4 @@
Source: tbb Source: tbb
Version: 2019_U8-1 Version: 2019_U8-2
Homepage: https://github.com/01org/tbb Homepage: https://github.com/01org/tbb
Description: Intel's Threading Building Blocks. Description: Intel's Threading Building Blocks.