change: package names correct

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e8460af33cae6ad559ffb54ebbf0ece19f83d1..be79b35b0fa5899ef1be8b8919b91e5027c13e3f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,16 +23,22 @@ target_link_libraries(discspan spandisc)
 
 install(TARGETS discspan
        DESTINATION ${BINPATH}
-       COMPONENT bin)
+       COMPONENT discspan)
 
 set(CPACK_GENERATOR "DEB")
 
-set(CPACK_DEB_COMPONENT_INSTALL ON)
-
 set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGE_DESCRIPTION "UI for libspandisc")
+set(CPACK_DEBIAN_ARCHITECTURE "amd64")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS bin spandisc)
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bastian Dehn <hhaalo@arcor.de")
 
+set(CPACK_DEBIAN_DISCPAN_FILE_NAME "${CPACK_PACKAGE_NAME}-bin_${PROJECT_VERSION}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
+set(CPACK_DEBIAN_LIBSPANDISC_FILE_NAME "libspandisc_${PROJECT_VERSION}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_FILE_NAME "libspandisc-dev_${PROJECT_VERSION}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
+
+set(CPACK_COMPONENTS_ALL discspan libspandisc libspandisc-dev)
+set(CPACK_DEB_COMPONENT_INSTALL ON)
+
 include(CPack)

diff --git a/libs/spandisc/CMakeLists.txt b/libs/spandisc/CMakeLists.txt
index 2d6c8546848ec6d2084de1a6cd2353e5f18bad57..9c1883ef2bea99f0ac7b1813de9658955fa58837 100644 (file)
--- a/libs/spandisc/CMakeLists.txt
+++ b/libs/spandisc/CMakeLists.txt
@@ -27,22 +27,24 @@ target_link_libraries(spandisc m)
 
 install(TARGETS spandisc
        DESTINATION ${INSTALL_LIBPATH}
-       COMPONENT lib
+       COMPONENT libspandisc
        PUBLIC_HEADER DESTINATION ${INSTALL_HEADER}
-       COMPONENT dev)
+       COMPONENT libspandisc-dev)
 
 set(CPACK_GENERATOR "DEB")
-set(CPACK_DEB_PACKAGE_COMPONENT ON)
-set(CPACK_DEB_COMPONENT_INSTALL ON)
-set(CPACK_DEBIAN_PACKAGE_DEPENDS lib)
-
-set(CPACK_DEBIAN_lib_PACKAGE_NAME "lib${PROJECT_NAME}")
-set(CPACK_DEBIAN_dev_PACKAGE_NAME "lib${PROJECT_NAME}-dev")
-set(CPACK_DEBIAN_dev_PACKAGE_DEPENDS lib)
 
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-set(CPACK_PACKAGE_DESRCIPTION
-       "text files contains file pathes split into media part files")
+set(CPACK_PACKAGE_DESRCIPTION "text files contains file pathes split into media part files")
+set(CPACK_DEBIAN_ARCHITECTURE "amd64")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS lib)
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_PACKAGE_DEPENDS lib)
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bastian Dehn <hhaalo@arcor.de")
 
+set(CPACK_DEBIAN_LIBSPANDISC_FILE_NAME "lib${PROJECT_NAME}_${PROJECT_VERSION}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
+set(CPACK_DEBIAN_LIBSPANDISC-DEV_FILE_NAME "lib${PROJECT_NAME}-dev_${PROJECT_VERSION}_${CPACK_DEBIAN_ARCHITECTURE}.deb")
+
+set(CPACK_COMPONENTS_ALL libspandisc libspandisc-dev)
+set(CPACK_DEB_COMPONENT_INSTALL ON)
+
 include(CPack)