Skip to content

Commit

Permalink
Error out on attempt to configure framework build with lib infix
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Tor Arne Vestbø <[email protected]>
  • Loading branch information
jobor committed Mar 17, 2021
1 parent 7b4507d commit e6cee41
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions configure.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


#### Inputs


Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit e6cee41

Please sign in to comment.