From e4cb32970cc1111d7bce95293e6766a879a6b5f7 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 24 Mar 2020 16:23:53 +0100 Subject: CMake: Regenerate and adjust projects after merge Some of the changes that were needed - adjusted wayland macros due to changed target names for plugins - a few direct moc file includes, to get rid of compilation errors - Threads::Threads linking for a few tests - a few special cases for QT_FOR_PRIVATE handling because pro2cmake doesn't handle those correctly at the moment (they map to PRIVATE_MODULE_INTERFACE rather than PRIVATE_LIBRARIES) - just regenerating all projects Change-Id: I418ce91b1c69c7388d41eb22b94a93a9e80fa732 Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a96c05ac8..3a28f3164 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS EglSupport GlxSupport LinuxAccessibilitySupport + PlatformCompositorSupport Quick ServiceSupport VulkanSupport @@ -33,8 +34,8 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS ) # special case end -if(NOT APPLE_OSX AND (ANDROID OR NOT LINUX)) - message(NOTICE "Skipping the build as the condition \"APPLE_OSX OR LINUX\" is not met.") +if(NOT MACOS AND NOT QNX AND (ANDROID OR NOT LINUX)) + message(NOTICE "Skipping the build as the condition \"LINUX OR MACOS OR QNX\" is not met.") return() endif() if(NOT TARGET Qt::Gui) -- cgit v1.2.3