diff options
| -rw-r--r-- | ports/tbb/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/tbb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tbb/portfile.cmake | 15 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/tbb.json | 5 |
5 files changed, 8 insertions, 22 deletions
diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt index a485d119d..ae53c40f2 100644 --- a/ports/tbb/CMakeLists.txt +++ b/ports/tbb/CMakeLists.txt @@ -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")
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index ea2bdc140..b089a3e7d 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -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 diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index ada16a7d7..bf65511b7 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -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() diff --git a/versions/baseline.json b/versions/baseline.json index 8b8873fec..d365b5d34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6094,7 +6094,7 @@ }, "tbb": { "baseline": "2020_U3", - "port-version": 4 + "port-version": 5 }, "tcl": { "baseline": "core-9-0-a1", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 2655af3fd..71c441dbf 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "475f44cf5033c6f3bfb5c69c5a301cddf18e7aa0", + "version-string": "2020_U3", + "port-version": 5 + }, + { "git-tree": "4e6228578b0ca40358f584aa1ea8b4a9ac2d4ed9", "version-string": "2020_U3", "port-version": 4 |