summaryrefslogtreecommitdiffstats
path: root/configure.cmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-03-15 12:21:55 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-03-30 15:13:52 +0000
commitf4262464747ed4147a8694924eaef26e66c6ef35 (patch)
tree71207a924b865068915219444fb9e7f3a64c1de4 /configure.cmake
parent098701edba230398440d7892bda18f4ebead32fe (diff)
Error out on attempt to configure framework build with lib infix
Setting a lib infix is not supported with framework builds due to the nature framework of include resolution: includes like <QtCore/qstring.h> 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. Change-Id: Ib7c6983f2f64ea1a7cfcd56657d31eeab3f55fe3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit e6cee41c53c4057002b70f26888b2dc40fa15047) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.cmake')
-rw-r--r--configure.cmake9
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake
index 6bfe12d670..eea334a0ce 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -1,5 +1,3 @@
-
-
#### Inputs
@@ -1114,6 +1112,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)