mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 04:50:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[tbb] Remove ability to disable exception support in TBB runtime (#18740)

Browse Source 
* After filing an issue with TBB (https://github.com/oneapi-src/oneTBB/issues/414), I found out that building the library with exceptions explicitly disabled as I had added support for had gone from not officially supported to more explicitly disallowed

* update tbb port-version

* run x-add-version
This commit is contained in:
aggieNick02 2021-07-01 09:27:37 -05:00 committed by GitHub
parent c37d7adbcc
commit 44bc692276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/tbb/CMakeLists.txt
View File

@ -1,13 +1,9 @@
project(tbb CXX)
option(DISABLE_EXCEPTIONS "Set exceptions=0 for make to turn off exception support in TBB" OFF)
file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*)
file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED)
if(DISABLE_EXCEPTIONS)
set(DISABLE_EXCEPTIONS_ARG exceptions=0)
endif()
if(NOT BUILD_SHARED_LIBS)
set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc)
endif()
@ -30,7 +26,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
endif()
endif()
tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${DISABLE_EXCEPTIONS_ARG} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT})
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")

2
ports/tbb/CONTROL
View File

@ -1,6 +1,6 @@
Source: tbb
Version: 2020_U3
Port-Version: 4
Port-Version: 5
Homepage: https://github.com/01org/tbb
Description: Intel's Threading Building Blocks.
Supports: !(uwp|arm|arm64) | linux | osx

15
ports/tbb/portfile.cmake
View File

@ -14,22 +14,11 @@ vcpkg_from_github(
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
if (TBB_DISABLE_EXCEPTIONS)
message(STATUS "Building TBB with exception-handling constructs disabled because TBB_DISABLE_EXCEPTIONS is set to ON.")
else()
message(STATUS "TBB uses exception-handling constructs by default (if supported by the compiler). This use can be disabled with 'SET(TBB_DISABLE_EXCEPTIONS ON)' in your custom triplet.")
endif()
if (NOT VCPKG_TARGET_IS_WINDOWS)
if (TBB_DISABLE_EXCEPTIONS)
set(DISABLE_EXCEPTIONS ON)
else()
set(DISABLE_EXCEPTIONS OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DDISABLE_EXCEPTIONS=${DISABLE_EXCEPTIONS}
)
vcpkg_install_cmake()
@ -73,10 +62,6 @@ else()
string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE"
"\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_RUNTIME" SLN_CONFIGURE "${SLN_CONFIGURE}")
endif()
if (TBB_DISABLE_EXCEPTIONS)
string(REPLACE "<PreprocessorDefinitions>%(PreprocessorDefinitions)<\/PreprocessorDefinitions>"
"<PreprocessorDefinitions>TBB_USE_EXCEPTIONS=0;%(PreprocessorDefinitions)<\/PreprocessorDefinitions>" SLN_CONFIGURE "${SLN_CONFIGURE}")
endif()
file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}")
endmacro()

2
versions/baseline.json
View File

@ -6094,7 +6094,7 @@
},
"tbb": {
"baseline": "2020_U3",
"port-version": 4
"port-version": 5
},
"tcl": {
"baseline": "core-9-0-a1",

5
versions/t-/tbb.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "475f44cf5033c6f3bfb5c69c5a301cddf18e7aa0",
"version-string": "2020_U3",
"port-version": 5
},
{
"git-tree": "4e6228578b0ca40358f584aa1ea8b4a9ac2d4ed9",
"version-string": "2020_U3",