summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2024-02-22 21:32:49 +0100
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2024-03-04 20:31:48 +0100
commit26f307ddb16563777bbd57ba1f29d656760c7ff3 (patch)
treeb071814da8992660a5ba6aefd2dae01fd68708b5
parent458be44aebd441884502798c569cfcdfb06d15a9 (diff)
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 6.6 6.7 Change-Id: I46e23d4a78c807e6617224ce7faff96e6985f449 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--bin/qt-configure-module.bat.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/qt-configure-module.bat.in b/bin/qt-configure-module.bat.in
index 10c8ef85fd..26d5c4b051 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