diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-15 12:21:55 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-17 09:04:57 +0100 |
commit | e6cee41c53c4057002b70f26888b2dc40fa15047 (patch) | |
tree | bff02a4c7460587a0c7e0c99acb5f0a6be809ec6 /configure.cmake | |
parent | 7b4507d0be28d1258d5569182a03e8ead8620f2d (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.
Pick-to: 6.1
Change-Id: Ib7c6983f2f64ea1a7cfcd56657d31eeab3f55fe3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'configure.cmake')
-rw-r--r-- | configure.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
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) |