From 8fd2313b8837315d296a3a57969c1b2718c86a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Tue, 13 Aug 2013 01:01:39 +0200 Subject: [PATCH] Macro name change: installPackage becomes plasma_install_package This naming is in line with the naming policy for frameworks. --- PlasmaMacros.cmake | 2 +- src/shell/applets/CMakeLists.txt | 6 +++--- src/shell/containments/CMakeLists.txt | 2 +- src/shell/qmlpackages/CMakeLists.txt | 4 ++-- src/shell/qmlpackages/wallpapers/CMakeLists.txt | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PlasmaMacros.cmake b/PlasmaMacros.cmake index 504656ee2..6933366eb 100644 --- a/PlasmaMacros.cmake +++ b/PlasmaMacros.cmake @@ -1,7 +1,7 @@ find_package(KF5 MODULE REQUIRED COMPONENTS InstallDirs) -macro(installPackage dir component) +macro(plasma_install_package dir component) set(root ${ARGV2}) set(type ${ARGV3}) if(NOT root) diff --git a/src/shell/applets/CMakeLists.txt b/src/shell/applets/CMakeLists.txt index a4771fe8e..acfa3ab2c 100644 --- a/src/shell/applets/CMakeLists.txt +++ b/src/shell/applets/CMakeLists.txt @@ -1,4 +1,4 @@ -installPackage(testapplet org.kde.testapplet) -installPackage(testcomponentsapplet org.kde.testcomponentsapplet) -installPackage(testshaderapplet org.kde.testshaderapplet) +plasma_install_package(testapplet org.kde.testapplet) +plasma_install_package(testcomponentsapplet org.kde.testcomponentsapplet) +plasma_install_package(testshaderapplet org.kde.testshaderapplet) diff --git a/src/shell/containments/CMakeLists.txt b/src/shell/containments/CMakeLists.txt index 193024f89..ee3d3c778 100644 --- a/src/shell/containments/CMakeLists.txt +++ b/src/shell/containments/CMakeLists.txt @@ -1,2 +1,2 @@ -installPackage(testpanel org.kde.panel plasma/plasmoids containment) +plasma_install_package(testpanel org.kde.panel plasma/plasmoids containment) diff --git a/src/shell/qmlpackages/CMakeLists.txt b/src/shell/qmlpackages/CMakeLists.txt index 776b5a537..66a6db680 100644 --- a/src/shell/qmlpackages/CMakeLists.txt +++ b/src/shell/qmlpackages/CMakeLists.txt @@ -1,5 +1,5 @@ -installPackage(desktop org.kde.desktop plasma/shells shell) -installPackage(lookandfeel org.kde.lookandfeel plasma/look-and-feel lookandfeel) +plasma_install_package(desktop org.kde.desktop plasma/shells shell) +plasma_install_package(lookandfeel org.kde.lookandfeel plasma/look-and-feel lookandfeel) add_subdirectory(wallpapers) diff --git a/src/shell/qmlpackages/wallpapers/CMakeLists.txt b/src/shell/qmlpackages/wallpapers/CMakeLists.txt index 40ed59791..0eb71ad89 100644 --- a/src/shell/qmlpackages/wallpapers/CMakeLists.txt +++ b/src/shell/qmlpackages/wallpapers/CMakeLists.txt @@ -1,3 +1,3 @@ -installPackage(color org.kde.color plasma/wallpapers wallpaper) -installPackage(autumn org.kde.autumn plasma/wallpapers wallpaper) +plasma_install_package(color org.kde.color plasma/wallpapers wallpaper) +plasma_install_package(autumn org.kde.autumn plasma/wallpapers wallpaper)