AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Enable exceptions by default

Browse Source 
Without breaking currently generated CMakeLists

Fixes: QTBUG-88549
Change-Id: Ibda643e1374d9024bf693c12de8ec0ac46e09b7b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Mårten Nordheim 2020-11-16 15:21:03 +01:00
parent e13173c112
commit f97d4732d4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtTestHelpers.cmake
View File

@ -142,8 +142,9 @@ endfunction()
# This function creates a CMake test target with the specified name for use with CTest. # This function creates a CMake test target with the specified name for use with CTest.
function(qt_internal_add_test name) function(qt_internal_add_test name)
# EXCEPTIONS is a noop as they are enabled by default.
qt_parse_all_arguments(arg "qt_add_test" qt_parse_all_arguments(arg "qt_add_test"
"RUN_SERIAL;EXCEPTIONS;GUI;QMLTEST;CATCH;LOWDPI" "RUN_SERIAL;EXCEPTIONS;NO_EXCEPTIONS;GUI;QMLTEST;CATCH;LOWDPI"
"OUTPUT_DIRECTORY;WORKING_DIRECTORY;TIMEOUT;VERSION" "OUTPUT_DIRECTORY;WORKING_DIRECTORY;TIMEOUT;VERSION"
"QML_IMPORTPATH;TESTDATA;QT_TEST_SERVER_LIST;${__default_private_args};${__default_public_args}" ${ARGN} "QML_IMPORTPATH;TESTDATA;QT_TEST_SERVER_LIST;${__default_private_args};${__default_public_args}" ${ARGN}
) )
@ -152,8 +153,11 @@ function(qt_internal_add_test name)
set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
endif() endif()
if (${arg_EXCEPTIONS}) # Qt modules get compiled without exceptions enabled by default.
set(exceptions_text "EXCEPTIONS") # However, testcases should be still built with exceptions.
set(exceptions_text "EXCEPTIONS")
if (${arg_NO_EXCEPTIONS})
set(exceptions_text "")
endif() endif()
if (${arg_GUI}) if (${arg_GUI})