Skip to content

Commit

Permalink
Port to ecm_add_qml_module
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasfella committed Jul 6, 2024
1 parent 45915c2 commit 6dbe007
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 31 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ include(ECMInstallIcons)
include(ECMSetupVersion)
include(ECMQtDeclareLoggingCategory)
include(ECMDeprecationSettings)
include(ECMQmlModule)

include(CMakePackageConfigHelpers)
include(CheckIncludeFiles)
Expand Down
13 changes: 7 additions & 6 deletions faces/import/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..)

add_library(FacesPlugin SHARED FacesPlugin.cpp FacesPlugin.h)
ecm_add_qml_module(FacesPlugin URI "org.kde.ksysguard.faces" VERSION 1.0)

target_link_libraries(FacesPlugin Qt::Qml KSysGuard::Sensors KSysGuard::SensorFaces KF6::Package KF6::ConfigCore KF6::ConfigGui KF6::ConfigQml)
target_sources(FacesPlugin PRIVATE FacesPlugin.cpp FacesPlugin.h)

install(TARGETS FacesPlugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/ksysguard/faces)
install(FILES
qmldir
ecm_target_qml_sources(FacesPlugin SOURCES
ExtendedLegend.qml
SensorFace.qml
SensorRangeSpinBox.qml
Choices.qml
CompactSensorFace.qml
DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/ksysguard/faces
)

target_link_libraries(FacesPlugin PRIVATE Qt::Qml KSysGuard::Sensors KSysGuard::SensorFaces KF6::Package KF6::ConfigCore KF6::ConfigGui KF6::ConfigQml)

ecm_finalize_qml_module(FacesPlugin)
7 changes: 0 additions & 7 deletions faces/import/qmldir

This file was deleted.

9 changes: 5 additions & 4 deletions formatter/declarative/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..)

add_library(FormatterPlugin SHARED FormatterPlugin.cpp FormatterPlugin.h FormatterWrapper.cpp FormatterWrapper.h)
ecm_add_qml_module(FormatterPlugin URI "org.kde.ksysguard.formatter" VERSION 1.0)

target_link_libraries(FormatterPlugin Qt::Qml KSysGuard::Formatter)
target_sources(FormatterPlugin PRIVATE FormatterPlugin.cpp FormatterPlugin.h FormatterWrapper.cpp FormatterWrapper.h)

install(TARGETS FormatterPlugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/ksysguard/formatter)
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/ksysguard/formatter)
target_link_libraries(FormatterPlugin PRIVATE Qt::Qml KSysGuard::Formatter)

ecm_finalize_qml_module(FormatterPlugin)
2 changes: 0 additions & 2 deletions formatter/declarative/qmldir

This file was deleted.

9 changes: 5 additions & 4 deletions processcore/declarative/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..)

add_library(ProcessPlugin SHARED ProcessPlugin.cpp ProcessPlugin.h ProcessEnums.cpp ProcessEnums.h)
ecm_add_qml_module(ProcessPlugin URI "org.kde.ksysguard.process" VERSION 1.0)

target_link_libraries(ProcessPlugin Qt::Qml KSysGuard::ProcessCore)
target_sources(ProcessPlugin PRIVATE ProcessPlugin.cpp ProcessPlugin.h ProcessEnums.cpp ProcessEnums.h)

install(TARGETS ProcessPlugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/ksysguard/process)
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/ksysguard/process)
target_link_libraries(ProcessPlugin PRIVATE Qt::Qml KSysGuard::ProcessCore)

ecm_finalize_qml_module(ProcessPlugin)
2 changes: 0 additions & 2 deletions processcore/declarative/qmldir

This file was deleted.

9 changes: 5 additions & 4 deletions sensors/declarative/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..)

add_library(SensorsPlugin SHARED SensorsPlugin.cpp SensorsPlugin.h)
ecm_add_qml_module(SensorsPlugin URI "org.kde.ksysguard.sensors" VERSION 1.0)

target_link_libraries(SensorsPlugin Qt::Qml KSysGuard::Sensors)
target_sources(SensorsPlugin PRIVATE SensorsPlugin.cpp SensorsPlugin.h)

install(TARGETS SensorsPlugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/ksysguard/sensors)
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/ksysguard/sensors)
target_link_libraries(SensorsPlugin PRIVATE Qt::Qml KSysGuard::Sensors)

ecm_finalize_qml_module(SensorsPlugin)
2 changes: 0 additions & 2 deletions sensors/declarative/qmldir

This file was deleted.

0 comments on commit 6dbe007

Please sign in to comment.