From ba9827ab5de200756f5c2c0899fc01f1d573eae2 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Sat, 14 Nov 2020 10:17:35 +0000 Subject: Follow up on change of QQmlListProperty to qsizetype Also update dependencies and fix non-gui builds. Disabled (for now) gltf unit test since JSON parser seems to crash. Change-Id: Ie7fdd9626653e89ad43e8bdb22b0e764618b1e9e Reviewed-by: Paul Lemire Reviewed-by: Mike Krus --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c41a9ed4..7cfdce7cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,17 +13,17 @@ project(Qt3D # special case # Make sure we only use latest private CMake API, aka no compatibility wrappers. set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui) -find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG - OPTIONAL_COMPONENTS Concurrent Widgets Qml Quick Gamepad OpenGL ShaderTools) +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) +find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS + Concurrent Widgets Qml Quick Gamepad OpenGL ShaderTools) # special case end if(NOT TARGET Qt::Gui) - message(FATAL_ERROR "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") return() endif() if(WASM OR NOT QT_FEATURE_opengl) - message(FATAL_ERROR "Skipping the build as the condition \"QT_FEATURE_opengl AND NOT WASM\" is not met.") + message(NOTICE "Skipping the build as the condition \"QT_FEATURE_opengl AND NOT WASM\" is not met.") return() endif() -- cgit v1.2.3