|
 |
36f8804 |
From 2de688e02fbc5ff96fcf29ad3af962e8035824eb Mon Sep 17 00:00:00 2001
|
|
|
36f8804 |
From: Alessandro Astone <ales.astone@gmail.com>
|
|
|
36f8804 |
Date: Wed, 27 Dec 2023 19:21:06 +0100
|
|
|
36f8804 |
Subject: [PATCH] Support KChart6 for KF6
|
|
|
36f8804 |
|
|
|
36f8804 |
---
|
|
|
36f8804 |
src/analyze/CMakeLists.txt | 14 ++++++++++++--
|
|
|
36f8804 |
src/analyze/gui/CMakeLists.txt | 2 +-
|
|
|
36f8804 |
2 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
36f8804 |
|
|
|
36f8804 |
diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt
|
|
|
36f8804 |
index e57d242e..e71aee9f 100644
|
|
|
36f8804 |
--- a/src/analyze/CMakeLists.txt
|
|
|
36f8804 |
+++ b/src/analyze/CMakeLists.txt
|
|
|
36f8804 |
@@ -34,6 +34,12 @@ endif()
|
|
|
36f8804 |
add_subdirectory(print)
|
|
|
36f8804 |
|
|
|
36f8804 |
if(HEAPTRACK_BUILD_GUI)
|
|
|
36f8804 |
+ if(QT_VERSION_MAJOR EQUAL 6)
|
|
|
36f8804 |
+ set(KChartName KChart6)
|
|
|
36f8804 |
+ else()
|
|
|
36f8804 |
+ set(KChartName KChart)
|
|
|
36f8804 |
+ endif()
|
|
|
36f8804 |
+
|
|
|
36f8804 |
find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} ${REQUIRED_IN_APPIMAGE} NO_MODULE OPTIONAL_COMPONENTS Widgets)
|
|
|
36f8804 |
set_package_properties(Qt${QT_VERSION_MAJOR} PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable.")
|
|
|
36f8804 |
find_package(ECM 1.0.0 ${REQUIRED_IN_APPIMAGE} NO_MODULE)
|
|
|
36f8804 |
@@ -41,8 +47,8 @@ if(HEAPTRACK_BUILD_GUI)
|
|
|
36f8804 |
if(Qt${QT_VERSION_MAJOR}_FOUND AND ECM_FOUND)
|
|
|
36f8804 |
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
|
|
|
36f8804 |
find_package(KF${QT_VERSION_MAJOR} ${REQUIRED_IN_APPIMAGE} COMPONENTS CoreAddons I18n ItemModels ThreadWeaver ConfigWidgets KIO IconThemes)
|
|
|
36f8804 |
- find_package(KChart ${REQUIRED_IN_APPIMAGE} "2.6.0")
|
|
|
36f8804 |
- set_package_properties(KChart PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable. Get it from the kdiagram module.")
|
|
|
36f8804 |
+ find_package(${KChartName} ${REQUIRED_IN_APPIMAGE} "2.6.0")
|
|
|
36f8804 |
+ set_package_properties(${KChartName} PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable. Get it from the kdiagram module.")
|
|
|
36f8804 |
if(KF${QT_VERSION_MAJOR}I18n_FOUND)
|
|
|
36f8804 |
ki18n_install(../../po)
|
|
|
36f8804 |
endif()
|
|
|
36f8804 |
@@ -51,6 +57,10 @@ if(HEAPTRACK_BUILD_GUI)
|
|
|
36f8804 |
endif()
|
|
|
36f8804 |
endif()
|
|
|
36f8804 |
|
|
|
36f8804 |
+if(KChart6_FOUND)
|
|
|
36f8804 |
+ set(KChart_FOUND TRUE)
|
|
|
36f8804 |
+endif()
|
|
|
36f8804 |
+
|
|
|
36f8804 |
if (KF${QT_VERSION_MAJOR}_FOUND)
|
|
|
36f8804 |
add_subdirectory(gui)
|
|
|
36f8804 |
endif()
|
|
|
36f8804 |
diff --git a/src/analyze/gui/CMakeLists.txt b/src/analyze/gui/CMakeLists.txt
|
|
|
36f8804 |
index f5803b67..2124683d 100644
|
|
|
36f8804 |
--- a/src/analyze/gui/CMakeLists.txt
|
|
|
36f8804 |
+++ b/src/analyze/gui/CMakeLists.txt
|
|
|
36f8804 |
@@ -92,7 +92,7 @@ if (KChart_FOUND)
|
|
|
36f8804 |
histogrammodel.cpp
|
|
|
36f8804 |
)
|
|
|
36f8804 |
list(APPEND LIBRARIES
|
|
|
36f8804 |
- KChart
|
|
|
36f8804 |
+ ${KChartName}
|
|
|
36f8804 |
Qt${QT_VERSION_MAJOR}::Svg
|
|
|
36f8804 |
)
|
|
|
36f8804 |
endif()
|
|
|
36f8804 |
--
|
|
|
36f8804 |
GitLab
|
|
|
36f8804 |
|