diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-21 15:46:53 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-21 15:46:53 +0100 |
| commit | e18891b3d8980445d54528bd6653403385c0671c (patch) | |
| tree | 3fb2481442ae344d8b33e81dd011627f464552a4 /CMakeLists.txt | |
| parent | 3b524734a29824986ce0344e06cb81527cd266d8 (diff) | |
| parent | 9bdf1616c6f1360658c7a97c0d7e681a932b4ee7 (diff) | |
| download | libuca-e18891b3d8980445d54528bd6653403385c0671c.tar.gz libuca-e18891b3d8980445d54528bd6653403385c0671c.tar.bz2 libuca-e18891b3d8980445d54528bd6653403385c0671c.tar.xz libuca-e18891b3d8980445d54528bd6653403385c0671c.zip | |
Merge branch 'dexela'
Conflicts:
plugins/dexela/CMakeLists.txt
src/CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8744c82..39c421e 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 <matthias.vogelgesang@kit.edu>") 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") @@ -39,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 ------------------------------------------------------------ |