Skip to content

Commit

Permalink
CMake: Don't hard-code "libexec" in qt-configure-module
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
jobor committed Aug 16, 2024
1 parent 928ddf3 commit 12b0f73
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bin/qt-configure-module.in
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ opttmpfilepath=${outpathPrefix}/config.opt.in
redofilepath=${outpathPrefix}/config.redo.last
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=
if [ -z "$optfile" ]; then # only write optfile if not currently redoing
Expand Down

0 comments on commit 12b0f73

Please sign in to comment.