AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Do not run auto-detection in top-level builds

Browse Source 
The top-level CMakeLists.txt already does that to ensure that
QtAutoDetect is included before any project command, meaning before any
toolchain file is loaded.

Task-number: QTBUG-87309
Change-Id: I60a998bdf999b6f751e4ebec2d13491fb206b132
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-10-09 11:48:23 +02:00
parent 605bbe2011
commit 7643295c12
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -1,9 +1,10 @@
# special case skip regeneration # special case skip regeneration
cmake_minimum_required(VERSION 3.15.0) cmake_minimum_required(VERSION 3.15.0)
# Run auto detection routines, but not when doing stnadalone tests. In that case the detection # Run auto detection routines, but not when doing standalone tests. In that case, the detection
# results are takend from either QtBuildInternals or the qt.toolchain.cmake file. # results are taken from either QtBuildInternals or the qt.toolchain.cmake file. Also, inhibit
if(NOT QT_BUILD_STANDALONE_TESTS) # 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)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtAutoDetect.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtAutoDetect.cmake)
endif() endif()