diff options
| author | tarcila <tarcila@users.noreply.github.com> | 2019-11-01 16:46:49 -0400 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-11-01 13:46:49 -0700 |
| commit | 84bafa656bc52a87388041f443dd5e2b54e5dd5b (patch) | |
| tree | 9aa45865e7c6a0fe4b3b210899e8abd15d4ffc73 | |
| parent | 38570e216e2d5541891cd1d6afa4d8487615d935 (diff) | |
| download | vcpkg-84bafa656bc52a87388041f443dd5e2b54e5dd5b.tar.gz vcpkg-84bafa656bc52a87388041f443dd5e2b54e5dd5b.zip | |
tbb: Fix compilation on OSX (#8744)
* 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
| -rw-r--r-- | ports/tbb/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/tbb/CONTROL | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt index 7216e3474..6d41b1555 100644 --- a/ports/tbb/CMakeLists.txt +++ b/ports/tbb/CMakeLists.txt @@ -7,7 +7,11 @@ include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED) if(NOT BUILD_SHARED_LIBS)
set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc)
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)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index da29e4879..a51904261 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,4 +1,4 @@ Source: tbb -Version: 2019_U8-1 +Version: 2019_U8-2 Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. |