From 63cb8f0ee736f07d73f877030c02515c8aa0dd85 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 22 Feb 2024 21:32:49 +0100 Subject: [PATCH] CMake/Windows: add quotes around the whole path, not just the dir The quotes should be around the whole file path, and not just around the directory. Otherwise it can cause the build to fail if Qt lives inside a directory that is symlinked from a different drive. Pick-to: 6.5 Change-Id: I46e23d4a78c807e6617224ce7faff96e6985f449 Reviewed-by: Alexandru Croitor (cherry picked from commit 26f307ddb16563777bbd57ba1f29d656760c7ff3) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 34162c1040d012bda726a6ce4fbb9dadb7b38fc1) --- bin/qt-configure-module.bat.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/qt-configure-module.bat.in b/bin/qt-configure-module.bat.in index 10c8ef85fda..26d5c4b0510 100644 --- a/bin/qt-configure-module.bat.in +++ b/bin/qt-configure-module.bat.in @@ -19,9 +19,9 @@ if not exist "%module_root%\CMakeLists.txt" ( set cmake_scripts_dir=%script_dir_path%\@__relative_path_to_cmake_scripts_dir@ echo %*>config.opt.in -call "%script_dir_path%"\qt-cmake.bat -DSKIP_ARGS=1 -DIN_FILE=config.opt.in -DOUT_FILE=config.opt ^ +call "%script_dir_path%\qt-cmake.bat" -DSKIP_ARGS=1 -DIN_FILE=config.opt.in -DOUT_FILE=config.opt ^ -P "%cmake_scripts_dir%\QtWriteArgsFile.cmake" -call "%script_dir_path%"\qt-cmake-private.bat -DOPTFILE=config.opt -DMODULE_ROOT="%module_root%" ^ +call "%script_dir_path%\qt-cmake-private.bat" -DOPTFILE=config.opt -DMODULE_ROOT="%module_root%" ^ -DCMAKE_COMMAND="%script_dir_path%\qt-cmake-private.bat" ^ -P "%cmake_scripts_dir%\QtProcessConfigureArgs.cmake" goto :eof