From cbb65358d31db5cb7ea460ad729fb0bbd2032b95 Mon Sep 17 00:00:00 2001 From: Digital Artifex <7929434+DigitalArtifex@users.noreply.github.com> Date: Tue, 5 Aug 2025 04:36:39 -0400 Subject: [PATCH] Corrected issues for building outside of kde-builder --- CMakeLists.txt | 11 ++++++----- plugin/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 157b491..af08d85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,12 +2,13 @@ cmake_minimum_required(VERSION 3.16) project(komplex VERSION 0.1 LANGUAGES CXX) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) set(QT_QML_GENERATE_QMLLS_INI ON) -set(KF_MIN_VERSION "5.68.0") +set(KF_MIN_VERSION "6.0.0") set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true) set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -28,6 +29,8 @@ endif() find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Multimedia Quick Quick3D) + include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) @@ -42,8 +45,6 @@ include(ECMDeprecationSettings) include(ECMQmlModule) include(GNUInstallDirs) -find_package(Qt6 REQUIRED COMPONENTS Quick Core Gui Quick3D Qml Multimedia) - find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS CoreAddons # KAboutData I18n # KLocalizedString @@ -51,7 +52,7 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS ) find_package(Plasma REQUIRED) -qt_standard_project_setup(REQUIRES 6.8) +qt_standard_project_setup(REQUIRES 6.9) add_definitions(-DTRANSLATION_DOMAIN=\"plasma_wallpaper_com.github.digitalartifex.komplex\") @@ -59,4 +60,4 @@ set(QMLPLUGIN_URI "com.github.digitalartifex.komplex") string(REPLACE "." "/" QMLPLUGIN_INSTALL_URI ${QMLPLUGIN_URI}) plasma_install_package(package ${QMLPLUGIN_URI} wallpapers wallpaper) -add_subdirectory(plugin) \ No newline at end of file +add_subdirectory(plugin) \ No newline at end of file diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt index f648092..922caab 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -4,7 +4,7 @@ set(BUILD_QML ON CACHE BOOL "") set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTOUIC ON) add_library( ${PROJECT_NAME} @@ -12,7 +12,7 @@ add_library( plugin.cpp ShaderPackModel.cpp AudioModel.cpp -) +) qt_add_qml_module( ${PROJECT_NAME}