Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add disable-exceptions feature to portfile for tbb #16068

Merged
merged 4 commits into from
Apr 8, 2021
Merged

Add disable-exceptions feature to portfile for tbb #16068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00e6e88
Add disable-exceptions feature to portfile to pass exceptions=0 to tb…
aggieNick02 Feb 5, 2021
75ee139
commit for changes from running x-add-version tbb to update for new p…
aggieNick02 Feb 7, 2021
1296a9c
Remove feature and undo changes made by x-add-version
aggieNick02 Feb 10, 2021
effc3f2
Rerun x-add-version
aggieNick02 Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ports/tbb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
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()
Expand All @@ -26,7 +30,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
endif()
endif()

tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT})
tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${DISABLE_EXCEPTIONS_ARG} ${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")
Expand Down
2 changes: 1 addition & 1 deletion ports/tbb/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: tbb
Version: 2020_U3
Port-Version: 3
Port-Version: 4
Homepage: https://github.com/01org/tbb
Description: Intel's Threading Building Blocks.
Supports: !(uwp|arm|arm64) | linux | osx
21 changes: 17 additions & 4 deletions ports/tbb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,22 @@ 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()
Expand Down Expand Up @@ -52,19 +63,21 @@ else()
configure_file(${CONFIGURE_FILE_NAME} ${CONFIGURE_BAK_FILE_NAME} COPYONLY)
endif()
configure_file(${CONFIGURE_BAK_FILE_NAME} ${CONFIGURE_FILE_NAME} COPYONLY)
file(READ ${CONFIGURE_FILE_NAME} SLN_CONFIGURE)
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(READ ${CONFIGURE_FILE_NAME} SLN_CONFIGURE)
string(REPLACE "<ConfigurationType>DynamicLibrary<\/ConfigurationType>"
"<ConfigurationType>StaticLibrary<\/ConfigurationType>" SLN_CONFIGURE "${SLN_CONFIGURE}")
string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE"
"\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_STATIC" SLN_CONFIGURE "${SLN_CONFIGURE}")
file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}")
else()
file(READ ${CONFIGURE_FILE_NAME} SLN_CONFIGURE)
string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE"
"\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_RUNTIME" SLN_CONFIGURE "${SLN_CONFIGURE}")
file(WRITE ${CONFIGURE_FILE_NAME} "${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()

CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbb.vcxproj)
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5674,7 +5674,7 @@
},
"tbb": {
"baseline": "2020_U3",
"port-version": 3
"port-version": 4
},
"tcl": {
"baseline": "core-9-0-a1",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tbb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4e6228578b0ca40358f584aa1ea8b4a9ac2d4ed9",
"version-string": "2020_U3",
"port-version": 4
},
{
"git-tree": "eb2f60732524f07ea5effc9aeda3472fd0bbe243",
"version-string": "2020_U3",
Expand Down