From b3fc0501bafba7c2e0ed5ef949de4b0ef6350c82 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 16 Aug 2015 03:24:44 +0300 Subject: [PATCH] unify build, allow cross build --- sources/CMakeLists.txt | 7 +------ sources/deb-recipe.cmake | 23 ---------------------- sources/packages-recipe.cmake | 37 +++++++++++++++++++++++++++++++++++ sources/rpm-recipe.cmake | 25 ----------------------- 4 files changed, 38 insertions(+), 54 deletions(-) delete mode 100644 sources/deb-recipe.cmake create mode 100644 sources/packages-recipe.cmake delete mode 100644 sources/rpm-recipe.cmake diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index f9b6bab..a488804 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -64,9 +64,4 @@ if(BUILD_PLASMOIDS) add_subdirectory(translations) endif() -if(BUILD_DEB_PACKAGE) - include(deb-recipe.cmake) -endif() -if(BUILD_RPM_PACKAGE) - include(rpm-recipe.cmake) -endif() +include(packages-recipe.cmake) diff --git a/sources/deb-recipe.cmake b/sources/deb-recipe.cmake deleted file mode 100644 index 3b1e328..0000000 --- a/sources/deb-recipe.cmake +++ /dev/null @@ -1,23 +0,0 @@ -set(CPACK_GENERATOR "DEB") -set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_BINARY_DIR}/DebPackageConfig.cmake") - -# versioning and naming -set(CPACK_PACKAGE_NAME "plasma-widget-awesome-widgets") -set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") -set(CPACK_PACKAGE_RELEASE "1") -set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") - -# metadata -set(CPACK_PACKAGE_CONTACT "${PROJECT_AUTHOR}") -set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)") -set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://arcanis.name/projects/awesome-widgets") -set(CPACK_DEBIAN_PACKAGE_SECTION "KDE") - -# build data -set(CPACK_DEBIAN_PACKAGE_DEPENDS "plasma-framework") -set(CPACK_DEBIAN_PACKAGE_ENHANCES "mpd, smartmontools") -set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# go go go! -include(CPack) -add_custom_target(deb COMMAND "${CMAKE_CPACK_COMMAND}" "-C" "$" "--config" "${CPACK_OUTPUT_CONFIG_FILE}") diff --git a/sources/packages-recipe.cmake b/sources/packages-recipe.cmake new file mode 100644 index 0000000..0a7f21c --- /dev/null +++ b/sources/packages-recipe.cmake @@ -0,0 +1,37 @@ +# generators +if(BUILD_DEB_PACKAGE) + set(CPACK_GENERATOR ${CPACK_GENERATOR} "DEB") +endif() +if(BUILD_RPM_PACKAGE) + set(CPACK_GENERATOR ${CPACK_GENERATOR} "RPM") +endif() + +# build properties +set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + +# general metadata +set(CPACK_PACKAGE_NAME "plasma-widget-awesome-widgets") +set(CPACK_PACKAGE_CONTACT "${PROJECT_AUTHOR}") +set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") +set(CPACK_PACKAGE_RELEASE "1") +# doesn't match to official arch :/ +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") + +# deb specific +set(CPACK_DEBIAN_PACKAGE_DEPENDS "plasma-framework") +set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)") +set(CPACK_DEBIAN_PACKAGE_ENHANCES "mpd, smartmontools") +set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://arcanis.name/projects/awesome-widgets") +set(CPACK_DEBIAN_PACKAGE_SECTION "KDE") + +# rpm specific +set(CPACK_RPM_PACKAGE_DESCRIPTION "Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)") +set(CPACK_RPM_PACKAGE_GROUP "User Interface/Desktops") +set(CPACK_RPM_PACKAGE_LICENSE "${PROJECT_LICENSE}") +set(CPACK_RPM_PACKAGE_REQUIRES "plasma-framework") +set(CPACK_RPM_PACKAGE_SUGGESTS "mpd, smartmontools") +set(CPACK_RPM_PACKAGE_URL "https://arcanis.name/projects/awesome-widgets") + +if(BUILD_DEB_PACKAGE OR BUILD_RPM_PACKAGE) + include(CPack) +endif() diff --git a/sources/rpm-recipe.cmake b/sources/rpm-recipe.cmake deleted file mode 100644 index 11750d8..0000000 --- a/sources/rpm-recipe.cmake +++ /dev/null @@ -1,25 +0,0 @@ -set(CPACK_GENERATOR "RPM") -set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_BINARY_DIR}/RpmPackageConfig.cmake") - -# versioning and naming -# I suppose it should be named as kde-plasma-* or plasma5-addons-* according to pkgs.org search -set(CPACK_PACKAGE_NAME "plasma5-awesome-widgets") -set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") -set(CPACK_PACKAGE_RELEASE "1") -set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") -set(CPACK_RPM_PACKAGE_LICENSE "${PROJECT_LICENSE}") - -# metadata -set(CPACK_PACKAGE_CONTACT "${PROJECT_AUTHOR}") -set(CPACK_RPM_PACKAGE_DESCRIPTION "Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)") -set(CPACK_RPM_PACKAGE_URL "https://arcanis.name/projects/awesome-widgets") -set(CPACK_RPM_PACKAGE_GROUP "User Interface/Desktops") - -# build data -set(CPACK_RPM_PACKAGE_REQUIRES "plasma-framework") -set(CPACK_RPM_PACKAGE_SUGGESTS "mpd, smartmontools") -set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# go go go! -include(CPack) -add_custom_target(rpm COMMAND "${CMAKE_CPACK_COMMAND}" "-C" "$" "--config" "${CPACK_OUTPUT_CONFIG_FILE}")