1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Allow tools to enable exceptions

Browse Source 
Needed for the QtApplicationManager tools.

Pick-to: 6.2
Change-Id: I987b297406b6659d777ce5c00f9fc1b89ccc80ab
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Robert Griebl 2021-06-14 16:54:40 +02:00
parent 9470529175
commit 6eea6e30c6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtToolHelpers.cmake
View File

@ -31,7 +31,7 @@
# #
function(qt_internal_add_tool target_name) function(qt_internal_add_tool target_name)
qt_tool_target_to_name(name ${target_name}) qt_tool_target_to_name(name ${target_name})
set(option_keywords BOOTSTRAP NO_INSTALL USER_FACING INSTALL_VERSIONED_LINK) set(option_keywords BOOTSTRAP NO_INSTALL USER_FACING INSTALL_VERSIONED_LINK EXCEPTIONS)
set(one_value_keywords set(one_value_keywords
TOOLS_TARGET TOOLS_TARGET
INSTALL_DIR INSTALL_DIR
@ -139,6 +139,11 @@ function(qt_internal_add_tool target_name)
set(bootstrap BOOTSTRAP) set(bootstrap BOOTSTRAP)
endif() endif()
set(exceptions "")
if(arg_EXCEPTIONS)
set(exceptions EXCEPTIONS)
endif()
set(install_dir "${INSTALL_BINDIR}") set(install_dir "${INSTALL_BINDIR}")
if(arg_INSTALL_DIR) if(arg_INSTALL_DIR)
set(install_dir "${arg_INSTALL_DIR}") set(install_dir "${arg_INSTALL_DIR}")
@ -146,6 +151,7 @@ function(qt_internal_add_tool target_name)
qt_internal_add_executable("${target_name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${install_dir}" qt_internal_add_executable("${target_name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${install_dir}"
${bootstrap} ${bootstrap}
${exceptions}
NO_INSTALL NO_INSTALL
SOURCES ${arg_SOURCES} SOURCES ${arg_SOURCES}
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES