diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-09-03 17:08:50 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-09-06 19:44:26 +0200 |
| commit | c8dbb177f03bcd8e65b8fac1008fe276fada2c92 (patch) | |
| tree | f1be8fc29f64ee9ebde7f6d17f1b5e0ab4581a39 /cmake/QtBuildInternals | |
| parent | 25feb2fe3e393dd1820bb4ee8c4105fb088de045 (diff) | |
CMake: Allow opting out of building examples as ExternalProjects
We default to configuring examples as separate ExternalProjects when
using a developer / non-prefix Qt build.
This ensures we test that the examples configure successfully without
the pollution of the main Qt build (e.g. already found packages).
One down-side of this is that a developer's IDE doesn't see these
example targets, unless each project is loaded into the IDE
separately. This is cumbersome to do when refactoring or renaming
code across multiple example projects.
Allow configuring the example projects as part of the main Qt build
by setting QT_BUILD_EXAMPLES_AS_EXTERNAL to FALSE when configuring Qt.
Save the value of the variable in QtBuildInternalsExtra.cmake.in
so it's propagated to leaf repositories as well.
Amends dab8f64b6d5d4241b678d0227355858071376496
Amends d97fd7af2bc5c89a0ad9e5fac080041b78d01179
Task-number: QTBUG-90820
Task-number: QTBUG-94608
Task-number: QTBUG-96232
Task-number: QTCREATORBUG-26168
Pick-to: 6.2
Change-Id: Ie1f724f74365b3a788b04c3fffe9eb2d0611dd50
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'cmake/QtBuildInternals')
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index c3c2f19761..0d2da108ef 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -669,8 +669,8 @@ macro(qt_examples_build_begin) cmake_parse_arguments(arg "${options}" "${singleOpts}" "${multiOpts}" ${ARGN}) - # FIXME: Support prefix builds as well - if(arg_EXTERNAL_BUILD AND NOT QT_WILL_INSTALL) + # FIXME: Support prefix builds as well QTBUG-96232 + if(arg_EXTERNAL_BUILD AND QT_BUILD_EXAMPLES_AS_EXTERNAL) # Examples will be built using ExternalProject. # We always depend on all plugins so as to prevent opportunities for # weird errors associated with loading out-of-date plugins from |