From 34d14e3bcd5639b3443281c20baf479cf7bd8fa9 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sun, 31 Dec 2023 11:43:05 +0100 Subject: [PATCH] Fix device and notifications QML plugins --- CMakeLists.txt | 6 ------ src/imports/device/CMakeLists.txt | 19 ------------------- src/imports/notifications/CMakeLists.txt | 19 ------------------- src/localdevice/CMakeLists.txt | 10 ++++++++-- src/notifications/CMakeLists.txt | 10 ++++++++-- 5 files changed, 16 insertions(+), 48 deletions(-) delete mode 100644 src/imports/device/CMakeLists.txt delete mode 100644 src/imports/notifications/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d4ba2c..65e34d8 100644 --- 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 deleted file mode 100644 index 4da15dd..0000000 --- a/src/imports/device/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-FileCopyrightText: 2023 Pier Luigi Fiorini -# SPDX-License-Identifier: BSD-3-Clause - -ecm_add_qml_module(DeviceQmlPlugin - URI - "Liri.Device" - VERSION - "1.0" - GENERATE_PLUGIN_SOURCE -) - -target_link_libraries(DeviceQmlPlugin - PUBLIC - Qt6::Core - Qt6::Qml - Liri::LocalDevice -) - -ecm_finalize_qml_module(DeviceQmlPlugin) diff --git a/src/imports/notifications/CMakeLists.txt b/src/imports/notifications/CMakeLists.txt deleted file mode 100644 index aba577a..0000000 --- a/src/imports/notifications/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-FileCopyrightText: 2023 Pier Luigi Fiorini -# SPDX-License-Identifier: BSD-3-Clause - -ecm_add_qml_module(NotificationsQmlPlugin - URI - "Liri.Notifications" - VERSION - "1.0" - GENERATE_PLUGIN_SOURCE -) - -target_link_libraries(NotificationsQmlPlugin - PUBLIC - Qt6::Core - Qt6::Qml - Liri::Notifications -) - -ecm_finalize_qml_module(NotificationsQmlPlugin) diff --git a/src/localdevice/CMakeLists.txt b/src/localdevice/CMakeLists.txt index abe96a5..5cdc30b 100644 --- a/src/localdevice/CMakeLists.txt +++ b/src/localdevice/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Pier Luigi Fiorini +# SPDX-FileCopyrightText: 2024 Pier Luigi Fiorini # 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 index e44c6f1..8ade4aa 100644 --- a/src/notifications/CMakeLists.txt +++ b/src/notifications/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Pier Luigi Fiorini +# SPDX-FileCopyrightText: 2024 Pier Luigi Fiorini # 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)