diff options
Diffstat (limited to 'bin/qt-configure-module.in')
| -rwxr-xr-x | bin/qt-configure-module.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/qt-configure-module.in b/bin/qt-configure-module.in index cdd350ea22..1b96f6a862 100755 --- a/bin/qt-configure-module.in +++ b/bin/qt-configure-module.in @@ -1,4 +1,6 @@ #!/bin/sh +set -eu + script_dir_path=`dirname $0` script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` @@ -28,8 +30,9 @@ fi optfile=config.opt echo > "$optfile" for arg in "$@"; do -echo $arg >> "$optfile" +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" |