From e6cee41c53c4057002b70f26888b2dc40fa15047 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 15 Mar 2021 12:21:55 +0100 Subject: Error out on attempt to configure framework build with lib infix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting a lib infix is not supported with framework builds due to the nature framework of include resolution: includes like won't work if the framework is named QtCoreInfix. The combination framework build and lib infix was agreed on to be out of scope in the comments of QTBUG-35604. Pick-to: 6.1 Change-Id: Ib7c6983f2f64ea1a7cfcd56657d31eeab3f55fe3 Reviewed-by: Alexandru Croitor Reviewed-by: Tor Arne Vestbø --- configure.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index 858f580a0e..26e887c559 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1,5 +1,3 @@ - - #### Inputs @@ -1090,6 +1088,13 @@ qt_configure_add_report_entry( MESSAGE "Command line option -sanitize fuzzer-no-link is only supported with clang compilers." CONDITION QT_FEATURE_sanitize_fuzzer_no_link AND NOT CLANG ) +# special case begin +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "Setting a library infix is not supported for framework builds." + CONDITION QT_FEATURE_framework AND DEFINED QT_LIBINFIX +) +# special case end qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC) qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC) -- cgit v1.2.3