Fix device and notifications QML plugins

lirios · Dec 31, 2023 · 34d14e3 · 34d14e3
1 parent 19504dd
commit 34d14e3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 48 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,12 +69,6 @@ endif()
 if(TARGET Liri::DBusService)
     add_subdirectory(src/imports/dbusservice)
 endif()
-if(TARGET Liri::LocalDevice)
-    add_subdirectory(src/imports/device)
-endif()
-if(TARGET Liri::Notifications)
-    add_subdirectory(src/imports/notifications)
-endif()
 if(BUILD_TESTING)
     if(TARGET Liri::Models)
         add_subdirectory(tests/auto/core)

diff --git a/src/imports/device/CMakeLists.txt b/src/imports/device/CMakeLists.txt
diff --git a/src/imports/notifications/CMakeLists.txt b/src/imports/notifications/CMakeLists.txt
diff --git a/src/localdevice/CMakeLists.txt b/src/localdevice/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Pier Luigi Fiorini <[email protected]>
+# SPDX-FileCopyrightText: 2024 Pier Luigi Fiorini <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 liri_add_module(LocalDevice
@@ -19,5 +19,11 @@ liri_add_module(LocalDevice
         Qt6DBus
         Qt6Qml
 )
-
 liri_finalize_module(LocalDevice)
+
+ecm_add_qml_module(LocalDevice
+    URI Liri.Device
+    VERSION 1.0
+    GENERATE_PLUGIN_SOURCE
+)
+ecm_finalize_qml_module(LocalDevice)
diff --git a/src/notifications/CMakeLists.txt b/src/notifications/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Pier Luigi Fiorini <[email protected]>
+# SPDX-FileCopyrightText: 2024 Pier Luigi Fiorini <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
 
 set(SOURCES
@@ -26,5 +26,11 @@ liri_add_module(Notifications
         Qt6QmlIntegration
         Qt6Gui
 )
-
 liri_finalize_module(Notifications)
+
+ecm_add_qml_module(Notifications
+    URI Liri.Notifications
+    VERSION 1.0
+    GENERATE_PLUGIN_SOURCE
+)
+ecm_finalize_qml_module(Notifications)