diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-02 20:45:01 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-03 13:06:14 +0100 |
| commit | 9a50d62039179346b2d7f6de2756c912c1fd1dec (patch) | |
| tree | 6e444a1f83ff00e7d10850712b62bcfb75144397 /configure.bat | |
| parent | 72aab8b4875dc3b14ef4a72a881047f4ef619f3d (diff) | |
CMake: Fix Windows top-level configure.bat
We must write config.opt in the same directory we're reading it from.
We must not write the -top-level argument to config.opt.
This amends commit 2a29426e39.
Change-Id: I96da9094579fec29c290411677d6b538878399f4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.bat b/configure.bat index 4c93e4b7e6..171074bc68 100644 --- a/configure.bat +++ b/configure.bat @@ -314,14 +314,14 @@ cd "%TOPQTDIR%" goto :eof :cmake +cd "%TOPQTDIR%" rem Write config.opt if we're not currently -redo'ing if "%rargs%" == "" ( - cmake -DOUT_FILE=config.opt -P "%QTSRC%\cmake\QtWriteArgsFile.cmake" %* + cmake -DOUT_FILE=config.opt -DIGNORE_ARGS=-top-level -P "%QTSRC%\cmake\QtWriteArgsFile.cmake" %* ) rem Launch CMake-based configure -cd "%TOPQTDIR%" set TOP_LEVEL_ARG= if %TOPLEVEL% == true set TOP_LEVEL_ARG=-DTOP_LEVEL=TRUE cmake -DOPTFILE=config.opt %TOP_LEVEL_ARG% -P "%QTSRC%\cmake\QtProcessConfigureArgs.cmake" |