Parcourir la source

revert to old kpackage syntax.

Malte Veerman il y a 7 ans
Parent
commit
a1c2c9383d
2 fichiers modifiés avec 2 ajouts et 10 suppressions
  1. 1 5
      fancontrol-gui/CMakeLists.txt
  2. 1 5
      kcm/CMakeLists.txt

+ 1 - 5
fancontrol-gui/CMakeLists.txt

@@ -22,8 +22,4 @@ install(TARGETS fancontrol_gui ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(PROGRAMS org.kde.fancontrol.gui.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.fancontrol.gui.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 
-if(${KF5_VERSION} VERSION_GREATER_EQUAL 5.42.0)
-    kpackage_install_bundled_package(package org.kde.fancontrol.gui genericqml)
-else(${KF5_VERSION} VERSION_GREATER_EQUAL 5.42.0)
-    kpackage_install_package(package org.kde.fancontrol.gui genericqml)
-endif(${KF5_VERSION} VERSION_GREATER_EQUAL 5.42.0)
+kpackage_install_package(package org.kde.fancontrol.gui genericqml)

+ 1 - 5
kcm/CMakeLists.txt

@@ -12,10 +12,6 @@ target_link_libraries(kcm_fancontrol ${LIBRARIES})
 install(TARGETS kcm_fancontrol DESTINATION "${KDE_INSTALL_QTPLUGINDIR}/kcms")
 install(PROGRAMS fancontrol-kcm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
-if(${KF5_VERSION} VERSION_GREATER_EQUAL 5.42.0)
-    kpackage_install_bundled_package(package org.kde.fancontrol.kcm kcms)
-else(${KF5_VERSION} VERSION_GREATER_EQUAL 5.42.0)
-    kpackage_install_package(package org.kde.fancontrol.kcm kcms)
-endif(${KF5_VERSION} VERSION_GREATER_EQUAL 5.42.0)
+kpackage_install_package(package org.kde.fancontrol.kcm kcms)
 
 kcoreaddons_desktop_to_json(kcm_fancontrol "fancontrol-kcm.desktop" SERVICE_TYPES kcmodule.desktop)