From 84dcbe4d5d9cfee1ebca30ba319d62edf2a388c3 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 7 Jul 2020 13:05:45 +0200 Subject: CMake: Fix qt-cmake-standalone-test when CMAKE_STAGING_PREFIX is set The qt-cmake-standalone-test script is kind of a "host tool" and contained paths to CMAKE_INSTALL_PREFIX, which is wrong if CMAKE_STAGING_PREFIX points to somewhere else. Fixes: QTBUG-85336 Change-Id: I4828dc6868d55cfc60f3ad2199185230d5cc9028 Reviewed-by: Alexandru Croitor --- cmake/QtBaseGlobalTargets.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index de5aaca2a1..355a24eaed 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -227,15 +227,15 @@ unset(__qt_cmake_extra) # and then calls add_subdirectory on the provided project path. set(__qt_cmake_standalone_test_bin_name "qt-cmake-standalone-test") set(__qt_cmake_private_path - "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qt-cmake-private") + "${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/qt-cmake-private") set(__qt_cmake_standalone_test_path "${__build_internals_install_dir}/${__build_internals_standalone_test_template_dir}") if(QT_WILL_INSTALL) - # Need to prepend the install prefix when doing prefix builds, because the build internals + # Need to prepend the staging prefix when doing prefix builds, because the build internals # install dir is relative in that case.. qt_path_join(__qt_cmake_standalone_test_path - "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}" + "${QT_STAGING_PREFIX}" "${__qt_cmake_standalone_test_path}") endif() if(UNIX) -- cgit v1.2.3