From 6eea6e30c601a8864bfbb38fc063c536f243d991 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Mon, 14 Jun 2021 16:54:40 +0200 Subject: [PATCH] cmake: Allow tools to enable exceptions Needed for the QtApplicationManager tools. Pick-to: 6.2 Change-Id: I987b297406b6659d777ce5c00f9fc1b89ccc80ab Reviewed-by: Alexandru Croitor Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann --- cmake/QtToolHelpers.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake index b923f1d3935..24ab9e01620 100644 --- a/cmake/QtToolHelpers.cmake +++ b/cmake/QtToolHelpers.cmake @@ -31,7 +31,7 @@ # function(qt_internal_add_tool 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 TOOLS_TARGET INSTALL_DIR @@ -139,6 +139,11 @@ function(qt_internal_add_tool target_name) set(bootstrap BOOTSTRAP) endif() + set(exceptions "") + if(arg_EXCEPTIONS) + set(exceptions EXCEPTIONS) + endif() + set(install_dir "${INSTALL_BINDIR}") if(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}" ${bootstrap} + ${exceptions} NO_INSTALL SOURCES ${arg_SOURCES} INCLUDE_DIRECTORIES