From 18c69b852935e167ba90877a3bfe9581fd8b6f70 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 29 Apr 2023 01:56:40 +0100 Subject: [PATCH] build(app): remove Qt6 dependency from qcustomplot --- app/external/qcustomplot/CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/external/qcustomplot/CMakeLists.txt b/app/external/qcustomplot/CMakeLists.txt index 64c27f3..f8226c0 100644 --- a/app/external/qcustomplot/CMakeLists.txt +++ b/app/external/qcustomplot/CMakeLists.txt @@ -2,15 +2,16 @@ # CMakeLists for qcustomplot # -if(${USE_QT6}) -FIND_PACKAGE(Qt6 REQUIRED COMPONENTS Core Gui Widgets PrintSupport) -IF (NOT Qt6_FOUND) -FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport) -ENDIF() +IF(${USE_QT6}) + FIND_PACKAGE(Qt6 QUIET COMPONENTS Core Gui Widgets PrintSupport) + IF (NOT Qt6_FOUND) + FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport) + ENDIF() ELSE() -FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport) + FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport) ENDIF() + SET(qcustomplot_SRCS qcustomplot.cpp qcustomplot.h) SET(CMAKE_AUTOMOC ON)