Skip to content

Commit

Permalink
Fix double inclusion of QtAutoDetect.cmake in top-level build
Browse files Browse the repository at this point in the history
The variable we need to check is called QT_SUPERBUILD, not
QT_SUPER_BUILD.

Pick-to: 6.1 6.0
Change-Id: I8487f491a0a4cebdf08f579519e99e6afe3db8c2
Reviewed-by: Alexey Edelev <[email protected]>
Reviewed-by: Cristian Adam <[email protected]>
  • Loading branch information
jobor committed Mar 4, 2021
1 parent eeb4c0a commit 7b6c526
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit 7b6c526

Please sign in to comment.