diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-14 16:58:33 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-23 14:26:18 +0200 |
| commit | 1c2ca4004d75e2ce400733ba14ed452dc3f0ca78 (patch) | |
| tree | fad149631f29b85fa661a9b1441e6dab31c22600 | |
| parent | c00ee2f31013e99c79b820a0db57003c110a5510 (diff) | |
Fix invalid path to the qt-cmake.bat when calling qt-internal-configure-tests.bat
Since qt-internal-configure-tests.bat is located in the same folder as
qt-cmake.bat the relative_path_from_libexec_dir_to_bin_dir is empty.
Passing doubled backslash in the windows path causes an issue for the
cmd.exe batch interpreter. Extra backslashes are treated by %~dp0 as a
start of the relative path. The following error appears:
Could not find toolchain file:
...\install\bin\..\/../lib/cmake/Qt6/qt.toolchain.cmake
This appends an extra backslash to relative_bin_dir only if
relative_path_from_libexec_dir_to_bin_dir is not empty.
Change-Id: Id2fd6c5fa9d73060350f298262c6e93a4887eeb3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | libexec/qt-internal-configure-tests.bat.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libexec/qt-internal-configure-tests.bat.in b/libexec/qt-internal-configure-tests.bat.in index dd2b0cc9c4..a59db01b14 100644 --- a/libexec/qt-internal-configure-tests.bat.in +++ b/libexec/qt-internal-configure-tests.bat.in @@ -5,5 +5,10 @@ set script_dir_path=%script_dir_path:~0,-1% set cmake_scripts_dir=%script_dir_path% -call "%script_dir_path%"\"@relative_path_from_libexec_dir_to_bin_dir@"\qt-cmake.bat ^ +set relative_bin_dir=@relative_path_from_libexec_dir_to_bin_dir@ +if NOT "%relative_bin_dir%" == "" ( +set relative_bin_dir="%relative_bin_dir%"\ +) + +call "%script_dir_path%"\%relative_bin_dir%"qt-cmake.bat" ^ @script_passed_args@ %* |