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

CMake: Don't hard-code "libexec" in qt-configure-module

Browse Source 
If INSTALL_LIBEXECDIR was set to something != "libexec",
qt-configure-module contained the wrong path to qt-cmake.

Fixes: QTBUG-128137
Pick-to: 6.5 6.7 6.8
Change-Id: Ic095ff8cb804bbdd72e238e75ac867b7cc3bd478
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Joerg Bornemann 2024-08-16 09:54:59 +02:00
parent 928ddf32af
commit 12b0f73a9e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/qt-configure-module.in
View File

@ -69,7 +69,7 @@ opttmpfilepath=${outpathPrefix}/config.opt.in
redofilepath=${outpathPrefix}/config.redo.last redofilepath=${outpathPrefix}/config.redo.last
redotmpfilepath=${outpathPrefix}/config.redo.in redotmpfilepath=${outpathPrefix}/config.redo.in
qt_cmake_private_path="$script_dir_path/../libexec" qt_cmake_private_path="$script_dir_path/../@INSTALL_LIBEXECDIR@"
fresh_requested_arg= fresh_requested_arg=
if [ -z "$optfile" ]; then # only write optfile if not currently redoing if [ -z "$optfile" ]; then # only write optfile if not currently redoing