From f35cc3a115cedec8d8efa1963c4d1047b7eb11b2 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 16 Aug 2024 09:54:59 +0200
Subject: [PATCH] CMake: Don't hard-code "libexec" in qt-configure-module

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

Fixes: QTBUG-128137
Pick-to: 6.7 6.5
Change-Id: Ic095ff8cb804bbdd72e238e75ac867b7cc3bd478
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 12b0f73a9e9cef35395d0a1560a51604c1c054ff)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 bin/qt-configure-module.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/qt-configure-module.in b/bin/qt-configure-module.in
index 1b96f6a8620..f1ba7d24981 100755
--- a/bin/qt-configure-module.in
+++ b/bin/qt-configure-module.in
@@ -34,5 +34,5 @@ echo "$arg" >> "$optfile"
 done
 
 cmake_script_path="$script_dir_path/@__relative_path_to_cmake_scripts_dir@/QtProcessConfigureArgs.cmake"
-qt_cmake_private_path="$script_dir_path/../libexec"
+qt_cmake_private_path="$script_dir_path/../@INSTALL_LIBEXECDIR@"
 "$qt_cmake_private_path/qt-cmake-private" -DOPTFILE=$optfile -DMODULE_ROOT="$module_root" -DCMAKE_COMMAND="$qt_cmake_private_path/qt-cmake-private" -P "$cmake_script_path"