From 1649082dabef075d6c3ffaf5c46d9bb46c87e744 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 5 Mar 2013 18:24:49 +0100 Subject: Trying to improve dexela plugin packaging. --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 299cec2..443f33c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,19 +10,20 @@ set(UCA_DESCRIPTION "Unified Camera Access") set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}") set(UCA_ABI_VERSION "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}") -set(PACKAGE_VERSION "${UCA_VERSION_STRING}") -set(PACKAGE_NAME "${TARNAME}") +set(CPACK_PACKAGE_VERSION "${UCA_VERSION_STRING}") +set(CPACK_PACKAGE_NAME "${TARNAME}") set(PACKAGE_TARNAME "${TARNAME}") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "http://ufo.kit.edu/ufo/newticket") -set(CPACK_GENERATOR "RPM") +set(CPACK_GENERATOR "DEB;RPM") set(CPACK_PACKAGE_RELEASE 3) -set(CPACK_DEBIAN_PACKAGE_NAME "libuca") +set(CPACK_RPM_PACKAGE_RELEASE 3) +set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Matthias Vogelgesang ") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${UCA_DESCRIPTION}) set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY ${UCA_DESCRIPTION}) -set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") -- cgit v1.2.3 From 9bdf1616c6f1360658c7a97c0d7e681a932b4ee7 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Thu, 21 Mar 2013 12:08:14 +0100 Subject: Improve libuca package compatibility with RPM systems. --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 443f33c..03abdad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,9 +40,6 @@ set(UCA_ENUM_HDRS configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package.sh.in ${CMAKE_CURRENT_BINARY_DIR}/package.sh) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libuca.spec.in" - "${CMAKE_CURRENT_BINARY_DIR}/libuca.spec" @ONLY IMMEDIATE) - # --- Common flags ------------------------------------------------------------ -- cgit v1.2.3