CMake: Fix default install prefix of top-level non-developer builds
A top-level non-developer build is supposed to default to a prefix like "/usr/local/Qt-6.3.0". That wasn't the case. In QtSetup.cmake we check CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT, set CMAKE_INSTALL_PREFIX and did the same thing later in QtBuildInternalsExtra.cmake, with a different value. Make sure we run the latter code only in per-repo builds. Pick-to: 6.2 Fixes: QTBUG-98087 Change-Id: I4a1291dfd126aa11c21d69809f2cf7b075c98d2e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
ac7e94090f
commit
7be143f438
@ -20,8 +20,10 @@ get_filename_component(QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX
|
|||||||
# If an explicit installation prefix is specified, honor it.
|
# If an explicit installation prefix is specified, honor it.
|
||||||
# This is an attempt to support Conan, aka handle installation of modules into a
|
# This is an attempt to support Conan, aka handle installation of modules into a
|
||||||
# different installation prefix than the original one. Also allow to opt out via a special variable.
|
# different installation prefix than the original one. Also allow to opt out via a special variable.
|
||||||
|
# In a top-level build, QtSetup.cmake takes care of setting CMAKE_INSTALL_PREFIX.
|
||||||
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND
|
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND
|
||||||
NOT QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX)
|
NOT QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX
|
||||||
|
AND NOT QT_SUPERBUILD)
|
||||||
set(qtbi_orig_prefix "@CMAKE_INSTALL_PREFIX@")
|
set(qtbi_orig_prefix "@CMAKE_INSTALL_PREFIX@")
|
||||||
set(qtbi_new_prefix "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}")
|
set(qtbi_new_prefix "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}")
|
||||||
if(CMAKE_HOST_WIN32)
|
if(CMAKE_HOST_WIN32)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user