1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Write all Host* properties to target_qt.conf

Browse Source 
Otherwise, qmake won't work if the host Qt was built with custom
INSTALL_BINDIR and friends.

Pick-to: 6.4
Task-number: QTBUG-106712
Change-Id: I436103efc21f245cc220f4706adcab369feba836
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2022-09-26 11:28:45 +02:00 committed by Jörg Bornemann
parent 72a3da3d4d
commit 5818dd3cad
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtQmakeHelpers.cmake
View File

@ -131,6 +131,9 @@ Prefix=${prefix}
"[Paths] "[Paths]
Prefix=${ext_prefix_relative_to_conf_file} Prefix=${ext_prefix_relative_to_conf_file}
HostPrefix=${host_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} HostData=${ext_datadir_relative_to_host_prefix}
Sysroot=${sysroot} Sysroot=${sysroot}
SysrootifyPrefix=${sysrootify_prefix} SysrootifyPrefix=${sysrootify_prefix}