diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-06 11:52:47 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-06 18:09:18 +0000 |
| commit | bf899ba53b0407f5ef88bddb15115d4f8f03c345 (patch) | |
| tree | a19eb13abe96c4231d69d8d7b6b68bb4ea8280f4 /cmake | |
| parent | b28c2c952850e80cc399dbba8a627a96789ffec9 (diff) | |
Propagate BUILD_TESTING and BUILD_EXAMPLES
As with qmake, you configure with or without -nomake tests -nomake
examples, and the choice is propagated to other repositories.
Do the same for CMake. It's still possible to opt out to build one
or the other by passing -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF
on the command line, which takes precedence over the value saved to
QtBuildInternalsExtra.
Change-Id: If0fbfa938d88309e7969c9bacc8d0bf86548bf5e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInternalsExtra.cmake.in | 4 | ||||
| -rw-r--r-- | cmake/QtSetup.cmake | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in index 165978e680..04a0998cf1 100644 --- a/cmake/QtBuildInternalsExtra.cmake.in +++ b/cmake/QtBuildInternalsExtra.cmake.in @@ -23,5 +23,9 @@ set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH "A path to the source tree of the previously configured QtBase project." FORCE) +# Propagate decision of building tests and examples to other repositories. +set(BUILD_TESTING @BUILD_TESTING@ CACHE BOOL "Build the testing tree.") +set(BUILD_EXAMPLES @BUILD_EXAMPLES@ CACHE BOOL "Build Qt examples") + # Extra set of exported variables @QT_EXTRA_BUILD_INTERNALS_VARS@ diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index 2958ba08cc..9095db4751 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -87,6 +87,9 @@ option(BUILD_TESTING "Build the testing tree." ${QT_BUILD_TESTING}) include(CTest) enable_testing() +# Set up building of examples. +option(BUILD_EXAMPLES "Build Qt examples" ON) + ## Define some constants to check for certain platforms, etc: include(QtPlatformSupport) |