diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-13 19:26:15 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-14 18:34:05 +0200 |
| commit | 389b3a131a03b819f2dd01c53222d185170e1924 (patch) | |
| tree | bd65c563d014db59a754f63097f79f53753e65aa /libexec | |
| parent | 38d56e2b72f61c662d79b8aad9dff4f4f1a0211a (diff) | |
Add drive letter to source paths when calling qt-internal- scripts
Like qt-configure-module.bat, when building with unity build, CMake
needs to know the full path of the source directory to be able to
correctly generate its `*_cxx.cxx` files. So far, this seems to only
affect Windows' LLVM/MinGW builds. By this patch, I make sure that we
pass the full path to CMake.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ida2da127ecba95856b6e0091936c471c2a116936
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/qt-internal-configure-tests.bat.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libexec/qt-internal-configure-tests.bat.in b/libexec/qt-internal-configure-tests.bat.in index a59db01b14..9dfae90ee7 100644 --- a/libexec/qt-internal-configure-tests.bat.in +++ b/libexec/qt-internal-configure-tests.bat.in @@ -3,6 +3,13 @@ setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS set script_dir_path=%~dp0 set script_dir_path=%script_dir_path:~0,-1% +rem add the drive letter to the source_dir_path, +rem by removing the path argument, expanding it, and adding it back +set source_dir_path=%~dpnx1 +set args=%* +set args=%args:* =% +set args=%source_dir_path% %args% + set cmake_scripts_dir=%script_dir_path% set relative_bin_dir=@relative_path_from_libexec_dir_to_bin_dir@ @@ -11,4 +18,4 @@ set relative_bin_dir="%relative_bin_dir%"\ ) call "%script_dir_path%"\%relative_bin_dir%"qt-cmake.bat" ^ - @script_passed_args@ %* + @script_passed_args@ %args% |