diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-29 11:34:32 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-30 08:22:30 +0100 |
| commit | 2a29426e3915ecc7fa5b4cbb06c7565c40ca2ec6 (patch) | |
| tree | 95ca992725cbea7f42592992b486e53b119c3c02 /configure.bat | |
| parent | de3bd644259b134d68414dcb8479f66f2f39fe70 (diff) | |
CMake: Fix argument passing for configure.bat / qt-configure-module.bat
Passing arguments with equal signs was broken for configure.bat and
qt-configure-module.bat. An argument FOO=BAR was split at = and written
as
FOO
BAR
to config.opt, breaking every attempt of assigning CMake variables.
We must not iterate over %* in batch files to avoid splitting arguments
at equal signs. Instead, pass %* unmodified to a CMake script that
writes config.opt.
Fixes: QTBUG-88019
Change-Id: I7c743a206961d1ed168f2313f864905f6b345b49
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.bat b/configure.bat index d90ebd150d..90d2eaa4f5 100644 --- a/configure.bat +++ b/configure.bat @@ -317,8 +317,7 @@ goto :eof rem Write config.opt if we're not currently -redo'ing if "%rargs%" == "" ( - if exist "%TOPQTDIR%\config.opt" del "%TOPQTDIR%\config.opt" - for %%a in (%ARGS%) do echo %%a >> "%TOPQTDIR%\config.opt" + cmake -DOUT_FILE=config.opt -P "%QTSRC%\cmake\QtWriteArgsFile.cmake" %* ) rem Launch CMake-based configure |