diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-07-22 14:24:36 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-07-27 16:38:20 +0200 |
| commit | e7edc1bc5c55a9b289bec2ff85f869c368bc9e5f (patch) | |
| tree | a31e4ff5aa3d94b8ea3b0850ddcc171cd4d94cff /CMakeLists.txt | |
| parent | e548c3f3c52c8a7bee0a384a5b3f7beb299a7541 (diff) | |
| download | qtwebengine-e7edc1bc5c55a9b289bec2ff85f869c368bc9e5f.tar.gz | |
Add missing dependecies for top level build
Pick-to: 6.2
Change-Id: I1e9f3733359c0a02c6f351b7a090ec9fe4664d45
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 a957a6b1b..54b750968 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,8 +170,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 @@ -194,6 +195,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) @@ -211,6 +213,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() |