diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e1a32a252..340fe9e8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,14 +14,6 @@ project(QtWayland # special case # TODO: Fix warnings and remove this set(QT_REPO_NOT_WARNINGS_CLEAN TRUE) -# TODO: Remove this after qtbase revert of -# dd7e40b1086020f6a054957f4972720cd684. -# Needed for correct dependency tracking of Wayland::Client -# and Wayland::Server in the separate qt_find_package() calls -# so that standalone tests configure successfully. -set(QT_FIND_PACKAGE_DISABLE_DEBUG_BEHAVIOR TRUE) - -# Find BuildInternals first by itself because it defines QNX find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 62c1adbec..ef145edd4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from src.pro. # special case begin qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner) -qt_find_package(Wayland) +qt_find_package(Wayland PROVIDED_TARGETS Wayland::Client Wayland::Server) if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND) message(WARNING "QtWayland is missing required dependencies, nothing will be built. \ |