From 7e03bc39b8bcdaa4e83e72ac99e117561c124951 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 15 Jun 2020 09:50:42 +0200 Subject: CMake: Improve sanitizer detection The change fixes the labels to show up correctly in the configure summary. It also allows enabling the sanitizer via the feature flags, e.g. -DFEATURE_sanitize_address=ON. Finally the qtbase sanitizer option is saved in QtBuildInternalsExtra so that repos built after qtbase have the same sanitizer options enabled. Change-Id: Ic9d9e3ce3c7ebbc244ced2e6d163d1ac8ee06b12 Fixes: QTBUG-84721 Reviewed-by: Fabian Kosmale Reviewed-by: Joerg Bornemann --- cmake/QtSetup.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake/QtSetup.cmake') diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index df13af93f7..607b3afebd 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -181,6 +181,7 @@ if (CMAKE_CROSSCOMPILING AND NOT IS_DIRECTORY ${QT_HOST_PATH}) endif() ## Enable support for sanitizers: +qt_internal_set_up_sanitizer_features() include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/extra-cmake-modules/modules/ECMEnableSanitizers.cmake) option(QT_USE_CCACHE "Enable the use of ccache") -- cgit v1.2.3