diff options
| author | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2022-12-12 15:08:41 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2022-12-13 10:02:25 +0000 |
| commit | 9773f0175cfe87b0c90db044ae20ddee3aae9ada (patch) | |
| tree | 4c5474568c488a8069d3159069715bc0647cec00 /bin | |
| parent | 9ce8d4890fdeaa02cc8a7687158d7453bbc7fd49 (diff) | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/qt-configure-module.in | 3 |
1 files changed, 2 insertions, 1 deletions
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" |