Skip to content

Commit

Permalink
CMake: Fix no_prefix feature to take into account the staging prefix
Browse files Browse the repository at this point in the history
Instead of complicating the condition even more, just use the value of
QT_WILL_INSTALL which is determined in QtSetup before configure.cmake
is loaded.

The AUTODETECT part is needed to ensure that
 -developer-build
implies -no-prefix.

The CONDITION part is needed so that
 -extprefix /tmp/sysroot -no-prefix
correctly errors out saying that this can't be a non-prefix build,
unless
 -extprefix ${qtbase_build_dir} -no-prefix
is passed.

Pick-to: 6.2 6.3
Change-Id: Ie4f5a91281bf2fbe1bd0744de05d57f43fe992e7
Reviewed-by: Jörg Bornemann <[email protected]>
  • Loading branch information
alcroito committed Apr 19, 2022
1 parent 8572647 commit 475ac94
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -484,11 +484,8 @@ qt_feature("developer-build" PRIVATE
)
qt_feature("no-prefix" PRIVATE
LABEL "No prefix build"
# The var expansion on the right hand side is on purpose
# because the custom condition evaluator only expands the lhs
CONDITION (CMAKE_INSTALL_PREFIX STREQUAL "${QtBase_BINARY_DIR}")
OR CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
AUTODETECT QT_FEATURE_developer_build
AUTODETECT NOT QT_WILL_INSTALL
CONDITION NOT QT_WILL_INSTALL
)
qt_feature("private_tests" PRIVATE
LABEL "Developer build: private_tests"
Expand Down

0 comments on commit 475ac94

Please sign in to comment.