diff options
| author | Aleix Pol <aleixpol@kde.org> | 2020-11-16 18:31:56 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-08 10:16:18 +0000 |
| commit | 53a14dfae0594176f644748183bf00cdaa34f4e0 (patch) | |
| tree | e1cb8ac1288cb4f29bf711a108c02eb3b02206a6 /cmake | |
| parent | 054ef63eb9dd6af6bbf5767ed9930f1bfc3aa29f (diff) | |
Offer to build manual tests through QT_BUILD_MANUAL_TESTS
Disabled by default as they are currently not being built and many are
not working properly, this will allow us to start using them again.
Change-Id: I823368d04e9fde2beccabedc3ca15efd1f355bfb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9d831491334e75f8ccc691edaeb173af81ab80ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 | ||||
| -rw-r--r-- | cmake/QtSetup.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index d9e4eb85ef..53c70533fb 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -455,8 +455,8 @@ macro(qt_build_tests) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/CMakeLists.txt" AND QT_BUILD_BENCHMARKS) add_subdirectory(benchmarks) endif() - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/manual/CMakeLists.txt") - # add_subdirectory(manual) don't build manual tests for now, because qmake doesn't. + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/manual/CMakeLists.txt" AND QT_BUILD_MANUAL_TESTS) + add_subdirectory(manual) endif() endmacro() diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index a77a1795b9..ec8be5e269 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -163,6 +163,8 @@ enable_testing() option(QT_BUILD_EXAMPLES "Build Qt examples" OFF) option(QT_BUILD_EXAMPLES_BY_DEFAULT "Should examples be built as part of the default 'all' target." ON) +option(QT_BUILD_MANUAL_TESTS "Build Qt manual tests" OFF) + ## Find host tools (if non native): set(QT_HOST_PATH "" CACHE PATH "Installed Qt host directory path, used for cross compiling.") |