diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-03 14:38:37 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-02-07 18:51:58 +0000 |
| commit | 60c8a68746ab0c5a02c8ca61466a9d82999e5201 (patch) | |
| tree | 940db8a4c535ad3a08de7f135224b42ca5a0b14c /configure.bat | |
| parent | 04a3e411ec0b961f2561a749f9e8f27a498c954c (diff) | |
| download | qtbase-60c8a68746ab0c5a02c8ca61466a9d82999e5201.tar.gz | |
Retrieve an old -redo behavior
It is not possible to manually edit the `config.opt` and do a redo, and
`configure/` uses the `config.opt` in this case.
Task-number: QTBUG-108287
Change-Id: I3d87b13a900b97fb50e49a4f155bec964ecb5d1a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.bat b/configure.bat index f3176d3e7a..1da3740a24 100644 --- a/configure.bat +++ b/configure.bat @@ -84,8 +84,12 @@ set REDO_TMP_FILE_PATH=%TOPQTDIR%\config.redo.in set FRESH_REQUESTED_ARG= if not defined redoing ( echo.%*>"%OPT_TMP_FILE_PATH%" + cmake -DIN_FILE="%OPT_TMP_FILE_PATH%" -DOUT_FILE="%OPT_FILE_PATH%" -DIGNORE_ARGS=-top-level -P "%QTSRC%\cmake\QtWriteArgsFile.cmake" ) else ( + echo. 2> "%OPT_TMP_FILE_PATH%" + for /F "usebackq tokens=*" %%A in ("%OPT_FILE_PATH%") do echo "%%A" >> "%OPT_TMP_FILE_PATH%" + cmake -DIN_FILE="%OPT_TMP_FILE_PATH%" -DREDO_FILE="%REDO_TMP_FILE_PATH%" -DOUT_FILE="%REDO_FILE_PATH%" -DIGNORE_ARGS="-top-level;-redo;--redo" -P "%QTSRC%\cmake\QtWriteArgsFile.cmake" set OPT_FILE_PATH=%REDO_FILE_PATH% |