diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-07-22 14:24:36 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-27 20:50:02 +0000 |
| commit | 774fba0ffb0b73735d292337083aac01f84edec1 (patch) | |
| tree | 6ebbd39c94da050f3fa1d46b46e17e453793d520 /CMakeLists.txt | |
| parent | c5b39720d6293c17559c00ab011966b7abffff43 (diff) | |
Add missing dependecies for top level build
Change-Id: I1e9f3733359c0a02c6f351b7a090ec9fe4664d45
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit e7edc1bc5c55a9b289bec2ff85f869c368bc9e5f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e853536f8..9939167a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,8 +176,9 @@ externalproject_add(qtwebengine ) # required for topLevel build +qt_get_tool_target_name(cacheGenTarget qmlcachegen) add_implicit_dependencies(qtwebengine Core Gui Widgets Network OpenGL - OpenGLWidgets Quick QuickWidgets Qml PrintSupport WebChannel Positioning + OpenGLWidgets Quick QuickWidgets Qml PrintSupport WebChannel Positioning ${cacheGenTarget} ) # Ensure the libs project is reconfigured if the root project is reconfigured, so that the @@ -200,6 +201,7 @@ endif() if(FORCE_TEST_RUN OR QT_BUILD_TESTS) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS QuickTest Test) + find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS WebSockets) unset(testRunCommand) if(FORCE_TEST_RUN) set(testRunCommand TEST_COMMAND ctest) @@ -217,6 +219,7 @@ if(FORCE_TEST_RUN OR QT_BUILD_TESTS) ${testRunCommand} ) externalproject_add_stepdependencies(qtwebengine_tests install qtwebengine) + add_implicit_dependencies(qtwebengine_tests Test QuickTest WebSockets) if(QT_BUILD_EXAMPLES AND BUILD_SHARED_LIBS) externalproject_add_stepdependencies(qtwebengine_tests install qtwebengine_examples) endif() |