Pass native path in qt-internal-configure-tests
In the previous patch, I did not account for how we usually use the
qt-internal-configure-test.bat in our CI. This should be a more robust
script, where we search for the source path, -S <PATH>, make it native,
and put it back.
Amend 389b3a131a
Pick-to: 6.5
Change-Id: Ic59de2eb1e6720de150a9e15a4b38fae4d871815
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
97ee38eb52
commit
bafe9dfc61
@ -3,12 +3,25 @@ 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
|
||||
rem Extracts the source path, make it native, and put it
|
||||
rem back again. This is a workaround on Windows LLVM/MINGW
|
||||
rem to help CMake find source files when doing Unity Build.
|
||||
set args=%*
|
||||
set args=%args:* =%
|
||||
set args=%source_dir_path% %args%
|
||||
set source_dir_path=
|
||||
set native_source_dir_path=
|
||||
for %%i in (%args%) do (
|
||||
if "%%i"=="-S" (
|
||||
set found=true
|
||||
) else if defined found (
|
||||
set source_dir_path=%%i
|
||||
set native_source_dir_path=%%~dpnxi
|
||||
set found=
|
||||
)
|
||||
)
|
||||
|
||||
if NOT "%native_source_dir_path%" == "" (
|
||||
set args=!args:%source_dir_path%=%native_source_dir_path%!
|
||||
)
|
||||
|
||||
set cmake_scripts_dir=%script_dir_path%
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user