summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-06-05 16:10:59 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-06-07 09:49:05 +0000
commitaa956e08229ee4884d88cc63b640b2cf19ef45d3 (patch)
treee59d54effd3b5edec2f4b1c891b649a568a24b48 /cmake
parent39f720e6ddf5b37159e25e6263a5931d61e5f01a (diff)
Change qt_build_repo to build tools if present and needed
This is needed for qtdeclarative, to automatically start building the tools if needed. Change-Id: I3cbe129e8bb6fa8572a8e34fd3653b51727cb244 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuildInternals/QtBuildInternalsConfig.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 6a1202ac2e..e4468aa355 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -70,6 +70,12 @@ macro(qt_build_repo)
add_subdirectory(src)
endif()
+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tools/CMakeLists.txt")
+ ## Decide whether tools will be built.
+ qt_check_if_tools_will_be_built()
+ add_subdirectory(tools)
+ endif()
+
if (BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/CMakeLists.txt")
find_package(Qt5 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Test Xml)
add_subdirectory(tests)