1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Nick Cao <nickcao@nichi.co>
3 Date: Wed, 12 Apr 2023 10:13:50 +0800
4 Subject: [PATCH] qtbase: qt-cmake: always use cmake from path
6 The generated qt-cmake scripts embeds the absolute path of cmake used
7 during the build of qtbase, bloating the runtime closure of qtbase.
9 bin/qt-cmake-create.in | 7 +------
10 bin/qt-cmake.in | 7 +------
11 2 files changed, 2 insertions(+), 12 deletions(-)
13 diff --git a/bin/qt-cmake-create.in b/bin/qt-cmake-create.in
14 index 7865d0fe91b..884dc4aba93 100755
15 --- a/bin/qt-cmake-create.in
16 +++ b/bin/qt-cmake-create.in
17 @@ -7,12 +7,7 @@ HELP_MESSAGE="Usage
18 script_dir_path=`dirname $0`
19 script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
21 -# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
22 -original_cmake_path="@CMAKE_COMMAND@"
23 -cmake_path=$original_cmake_path
24 -if ! test -f "$cmake_path"; then
29 if [ "$#" -gt 1 ]; then
30 echo "Invalid number of arguments"
31 diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in
32 index f719257f602..571ffe788fa 100755
36 script_dir_path=`dirname $0`
37 script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
39 -# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
40 -original_cmake_path="@CMAKE_COMMAND@"
41 -cmake_path=$original_cmake_path
42 -if ! test -f "$cmake_path"; then
47 toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake"