diff options
| author | Björn Schäpers <bjoern@hazardy.de> | 2022-02-10 00:47:16 +0100 |
|---|---|---|
| committer | Jörg Bornemann <joerg.bornemann@qt.io> | 2022-02-15 08:08:48 +0000 |
| commit | c6808d42963d78a816c0b8df77b81ed42d8039e3 (patch) | |
| tree | 7edc11010b74f287aff4dd3e019444c4f18c08e2 /configure.bat | |
| parent | 3ec76f82bab883b02d6ddf0bcc8ab4a6802292c9 (diff) | |
configure: Fix -redo when configure line contained equal sign(s)
If the original configure arguments contained equal sign(s) like in
configure ... -- -DQT_BUILD_SUBMODULES=qtbase;...
The following error message was printed:
=qtbase was unexpected at this time.
The reason is that the conditional
if "%rargs%" == ""
would expand to something like
if ""-DQT_BUILD_SUBMODULES=qtsvg"" == ""
which is invalid, because the equal sign is used outside of a string
literal.
Use delayed expansion in the conditional to fix this.
Pick-to: 6.2 6.3
Change-Id: I8c40d799db2c5aae8cba190ed31804c71a605935
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.bat b/configure.bat index 54fa2b2110..c78daf6e3b 100644 --- a/configure.bat +++ b/configure.bat @@ -103,7 +103,7 @@ goto doneargs cd "%TOPQTDIR%" rem Write config.opt if we're not currently -redo'ing -if "%rargs%" == "" ( +if "!rargs!" == "" ( echo %*>config.opt.in cmake -DIN_FILE=config.opt.in -DOUT_FILE=config.opt -DIGNORE_ARGS=-top-level -P "%QTSRC%\cmake\QtWriteArgsFile.cmake" ) |