diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-07 10:23:28 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-07 08:28:27 +0000 |
| commit | 2c7ccfefedd582403902879857f34cc2dd373773 (patch) | |
| tree | 90b959c3ee4c138750f3a18da34d9a83f9192aad | |
| parent | ebe77c89de0a82490cef5701f9da7b270b8808a1 (diff) | |
Perform check for tool builds before src
Perform the test whether tools should be built before entering the
source directory of a project. In QtDeclarative this would result in
a configuration error since the tools are used while building everything
under src.
Change-Id: I33ce2cb317ef221836d696654f3bb4e39db47e54
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 590885c44d..022c7994f1 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -76,13 +76,14 @@ macro(qt_build_repo) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Test) endif() + ## Decide whether tools will be built. + qt_check_if_tools_will_be_built() + if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt") 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() |