CMake: Recompute QT_DEPLOY_PREFIX for each built example
The current deployment api implementation sets the value of QT_DEPLOY_PREFIX based on CMAKE_INSTALL_PREFIX, if no QT_DEPLOY_PREFIX was previously specified. This does not work properly when multiple examples are placed in the same subdirectory and are using deployment api. Make sure to unset the QT_DEPLOY_PREFIX for each qt_internal_add_example call, so that a correct prefix is computed for each example, based on the modified CMAKE_INSTALL_PREFIX value that we set for each example. Pick-to: 6.7 Task-number: QTBUG-102057 Change-Id: I931e5f2d683ab94a940e20a2bdfeaa4ac5d8c5f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
c90964788c
commit
c5d0e93199
@ -271,7 +271,9 @@ function(qt_internal_add_example_in_tree subdir)
|
||||
install(CODE "
|
||||
# Unset the CMAKE_INSTALL_PREFIX in the current cmake_install.cmake file so that it can be
|
||||
# overridden in the included add_subdirectory-specific cmake_install.cmake files instead.
|
||||
# Also unset the deployment prefix, so it can be recomputed for each example subdirectory.
|
||||
unset(CMAKE_INSTALL_PREFIX)
|
||||
unset(QT_DEPLOY_PREFIX)
|
||||
")
|
||||
|
||||
# Override the install prefix in the subdir cmake_install.cmake, so that
|
||||
|
Loading…
x
Reference in New Issue
Block a user