AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invalid path to the qt-cmake.bat when calling qt-internal-configure-tests.bat

Browse Source 
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>
This commit is contained in:
Alexey Edelev 2021-06-14 16:58:33 +02:00
parent c00ee2f310
commit 1c2ca4004d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libexec/qt-internal-configure-tests.bat.in
View File

@ -5,5 +5,10 @@ set script_dir_path=%script_dir_path:~0,-1%
set cmake_scripts_dir=%script_dir_path% 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@ %* @script_passed_args@ %*