diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-17 12:16:47 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-22 22:20:43 +0200 |
| commit | 25cc901f049cdabcffda02b640a9a684fca8caa4 (patch) | |
| tree | 873b30b07e50e3b155f5468eac7e6c0d71eeb343 /configure.bat | |
| parent | 8d4eb292b2e8fc14437db97febdc2eebe36ed3ce (diff) | |
| download | qtbase-25cc901f049cdabcffda02b640a9a684fca8caa4.tar.gz | |
CMake: Fix configure -redo for top-level builds
When re-doing in a top-level build, we did not read the config.opt file
from the top-level directory.
Also, the config.opt file should not contain the -top-level argument.
This is an internal option, and on Windows, it was already missing. The
information whether we're doing a top-level build is now passed in the
CMake variable TOP_LEVEL.
Change-Id: Iaecd7306a4b6d9ad494684c201cf12f8e74d684b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.bat b/configure.bat index 4bb78f9069..8323f9ec85 100644 --- a/configure.bat +++ b/configure.bat @@ -316,4 +316,6 @@ if "%rargs%" == "" ( rem Launch CMake-based configure cd "%TOPQTDIR%" -cmake -DOPTFILE=config.opt -P "%QTSRC%\cmake\QtProcessConfigureArgs.cmake" +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" |