From 42acd3514b740553da7c155cbd2ff8f6386b973d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 26 Sep 2022 11:28:45 +0200 Subject: [PATCH] CMake: Write all Host* properties to target_qt.conf Otherwise, qmake won't work if the host Qt was built with custom INSTALL_BINDIR and friends. Task-number: QTBUG-106712 Change-Id: I436103efc21f245cc220f4706adcab369feba836 Reviewed-by: Alexandru Croitor (cherry picked from commit 5818dd3cadfe8184ed37a5d3d8363a1204a90aac) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtQmakeHelpers.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake index e10ea2cdd8f..f7eb0a91eb3 100644 --- a/cmake/QtQmakeHelpers.cmake +++ b/cmake/QtQmakeHelpers.cmake @@ -128,6 +128,9 @@ Prefix=${prefix} "[Paths] Prefix=${ext_prefix_relative_to_conf_file} HostPrefix=${host_prefix_relative_to_conf_file} +HostBinaries=${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR} +HostLibraries=${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_LIBDIR} +HostLibraryExecutables=${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_LIBEXECDIR} HostData=${ext_datadir_relative_to_host_prefix} Sysroot=${sysroot} SysrootifyPrefix=${sysrootify_prefix}