From 2f9abe7e47d60df2b5d9564f897e6769a82c56f3 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 28 Apr 2023 23:12:20 +0100 Subject: [PATCH] fix(qt): make Qt6 optional --- app/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 5f157fc..36e0d4b 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -13,13 +13,13 @@ OPTION(USE_FERVOR "Add Fervor support" OFF) OPTION(CALYP_MANAGED_RESOURCES "Handle streams in separate threads" ON) OPTION(CALYP_THREADED_MODULES "Use threads for modules" ON) -if(${USE_QT6}) -FIND_PACKAGE(Qt6 REQUIRED COMPONENTS Core Gui Widgets Concurrent) -IF (NOT Qt6_FOUND) -FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets Concurrent) -ENDIF() +IF(${USE_QT6}) + FIND_PACKAGE(Qt6 QUIET COMPONENTS Core Gui Widgets Concurrent) + IF (NOT Qt6_FOUND) + FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets Concurrent) + ENDIF() ELSE() -FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets Concurrent) + FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets Concurrent) ENDIF() ADD_SUBDIRECTORY(external)