From 9773f0175cfe87b0c90db044ae20ddee3aae9ada Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Mon, 12 Dec 2022 15:08:41 +0100 Subject: Return qt-configure-module to bin/ We agreed that qt-configure-module needs to come back to bin/ as it's user-facing. Amends d77ce33082516234fd7bbb5335401a1f3af8ca27 [ChangeLog][CMake] Upon further consideration, qt-configure-module was deemed user-facing, and was thus moved back to ./bin on all platforms. Task-number: QTBUG-107621 Change-Id: I1f7874436e5b3988242091fc0303ea828f29d5c6 Reviewed-by: Alexandru Croitor --- bin/qt-configure-module.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/qt-configure-module.in b/bin/qt-configure-module.in index d0a2f3bdf4..1b96f6a862 100755 --- a/bin/qt-configure-module.in +++ b/bin/qt-configure-module.in @@ -34,4 +34,5 @@ echo "$arg" >> "$optfile" done cmake_script_path="$script_dir_path/@__relative_path_to_cmake_scripts_dir@/QtProcessConfigureArgs.cmake" -"$script_dir_path/qt-cmake-private" -DOPTFILE=$optfile -DMODULE_ROOT="$module_root" -DCMAKE_COMMAND="$script_dir_path/qt-cmake-private" -P "$cmake_script_path" +qt_cmake_private_path="$script_dir_path/../libexec" +"$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" -- cgit v1.2.3