From 4b1134c4397599ee1782450159670ddf33badb32 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Wed, 24 Jan 2024 01:43:22 -0800
Subject: [PATCH] Don't use ECM for plugin

---
 CMakeLists.txt                 | 13 +++++--------
 src/declarative/CMakeLists.txt |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 462ef9a..b3dbb6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,9 +10,6 @@ set(PROJECT_VERSION_MAJOR 6)
 set(CMAKE_C_STANDARD 99)
 
 set(QT_MIN_VERSION "6.6.0")
-#set(KF6_MIN_VERSION "5.240.0")
-#set(KDE_COMPILERSETTINGS_LEVEL "5.82")
-
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -23,14 +20,14 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMSetupVersion)
-include(ECMDeprecationSettings)
+#include(ECMDeprecationSettings)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 #include(FeatureSummary)
 include(GenerateExportHeader)
 #include(KDEClangFormat)
 include(ECMQtDeclareLoggingCategory)
-include(ECMQmlModule)
+#include(ECMQmlModule)
 
 
 find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
@@ -55,9 +52,9 @@ ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX LAYERSHELLQT
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 #kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
 
-ecm_set_disabled_deprecation_versions(QT 6.5
-    KF 5.240
-)
+#ecm_set_disabled_deprecation_versions(QT 6.5
+#    KF 5.240
+#)
 
 add_subdirectory(src)
 #add_subdirectory(tests)
diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt
index c97d6fd..f01ea5f 100644
--- a/src/declarative/CMakeLists.txt
+++ b/src/declarative/CMakeLists.txt
@@ -3,10 +3,10 @@
 
 set(BUILD_SHARED_LIBS ON)
 
-ecm_add_qml_module(LayerShellQtQml
+qt_add_qml_module(LayerShellQtQml
                   URI "org.kde.layershell"
                   VERSION 1.0
                   SOURCES layershellqtplugin.cpp)
 target_link_libraries(LayerShellQtQml PRIVATE Qt::Qml LayerShellQtInterface)
 
-ecm_finalize_qml_module(LayerShellQtQml DESTINATION ${KDE_INSTALL_QMLDIR})
+#ecm_finalize_qml_module(LayerShellQtQml DESTINATION ${KDE_INSTALL_QMLDIR})