diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-04 10:42:34 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-30 15:11:24 +0000 |
| commit | 6aa3122c3baceebe9d222aa48d213d59b7196aa7 (patch) | |
| tree | 2c0b9e2fedc3bf0870698f5cfc365511ba1a7255 | |
| parent | da778d7ade955b0c5034e82864db03dbdb48acb7 (diff) | |
Fix double inclusion of QtAutoDetect.cmake in top-level build
The variable we need to check is called QT_SUPERBUILD, not
QT_SUPER_BUILD.
Change-Id: I8487f491a0a4cebdf08f579519e99e6afe3db8c2
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit 7b6c526ef1857101a0274ff8d945d4ce08c9bd61)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fb65fbd28..2e05aa52e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ qt_internal_check_for_suitable_cmake_version() # Run auto detection routines, but not when doing standalone tests. In that case, the detection # results are taken from either QtBuildInternals or the qt.toolchain.cmake file. Also, inhibit # auto-detection in a top-level build, because the top-level project file already includes it. -if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_SUPER_BUILD) +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_SUPERBUILD) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtAutoDetect.cmake) endif() |