Browse Source

made new kpackage_install_bundled_package conditional on kde frameworks version

Malte Veerman 7 years ago
parent
commit
5208f50dbf
2 changed files with 10 additions and 2 deletions
  1. 5 1
      fancontrol-gui/CMakeLists.txt
  2. 5 1
      kcm/CMakeLists.txt

+ 5 - 1
fancontrol-gui/CMakeLists.txt

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

+ 5 - 1
kcm/CMakeLists.txt

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