From 280263c44a9886f36b6df9d4972d48faecafc385 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Mon, 30 Aug 2021 15:29:46 +0200 Subject: [PATCH] add: spandisc cpack config file --- CMakeLists.txt | 13 +------------ libs/spandisc/CMakeLists.txt | 15 +-------------- libs/spandisc/CPackConfig.cmake | 13 +++++++++++++ 3 files changed, 15 insertions(+), 26 deletions(-) create mode 100644 libs/spandisc/CPackConfig.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 748974b..0486a6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,17 +64,6 @@ else() set(CPACK_DEBIAN_DISCSPAN_PACKAGE_DEPENDS "discspan") endif() -# libspandisc package -set(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_NAME "libspandisc") -set(CPACK_DEBIAN_LIBSPANDISC_FILE_NAME "libspandisc_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb") -set(CPACK_DEBIAN_LIBSPANDISC_DESCRIPTION "library with logic to split many files to media discs") -SET(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_SECTION "libs") - -# libspandisc-dev package -set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_NAME "libspandisc-dev") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_FILE_NAME "libspandisc-dev_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_DESCRIPTION "libspandisc library header files") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_DEPENDS "libspandisc") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_SECTION "devel") +include(libs/spandisc/CPackConfig.cmake) include(CPack) diff --git a/libs/spandisc/CMakeLists.txt b/libs/spandisc/CMakeLists.txt index d2bf352..b093e7b 100644 --- a/libs/spandisc/CMakeLists.txt +++ b/libs/spandisc/CMakeLists.txt @@ -58,19 +58,6 @@ set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://gitweb.hhaalo.de/?p=discspan.git") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_DEPENDS "libspandisc") - -# libspandisc -set(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_NAME "libspandisc") -set(CPACK_DEBIAN_LIBSPANDISC_FILE_NAME "libspandisc_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb") -set(CPACK_DEBIAN_LIBSPANDISC_DESCRIPTION "library with logic to split many files to media discs") -SET(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_SECTION "libs") - -# libspandisc-dev -set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_NAME "libspandisc-dev") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_DEPENDS "libspandisc") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_FILE_NAME "libspandisc-dev_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_DESCRIPTION "libspandisc library header files") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_DEPENDS "libspandisc") -set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_SECTION "devel") +include(CPackConfig.cmake) include(CPack) diff --git a/libs/spandisc/CPackConfig.cmake b/libs/spandisc/CPackConfig.cmake new file mode 100644 index 0000000..2c1db21 --- /dev/null +++ b/libs/spandisc/CPackConfig.cmake @@ -0,0 +1,13 @@ +# libspandisc +set(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_NAME "libspandisc") +set(CPACK_DEBIAN_LIBSPANDISC_FILE_NAME "libspandisc_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb") +set(CPACK_DEBIAN_LIBSPANDISC_DESCRIPTION "library with logic to split many files to media discs") +SET(CPACK_DEBIAN_LIBSPANDISC_PACKAGE_SECTION "libs") + +# libspandisc-dev +set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_NAME "libspandisc-dev") +set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_DEPENDS "libspandisc") +set(CPACK_DEBIAN_LIBSPANDISC-DEV_FILE_NAME "libspandisc-dev_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_ARCHITECTURE}.deb") +set(CPACK_DEBIAN_LIBSPANDISC-DEV_DESCRIPTION "libspandisc library header files") +set(CPACK_DEBIAN_LIBSPANDISC-DEV_DEPENDS "libspandisc") +set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_SECTION "devel") -- 2.39.5