diff options
| author | Mihael Koep <koep@schneide.com> | 2013-11-06 11:55:19 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-11-06 14:43:09 +0100 |
| commit | 8141f8527435e86f47bd89c797a3811aa99cb840 (patch) | |
| tree | f0b9c9148ecfa0ae38ead3f9dea01ea4869eef15 | |
| parent | 21b23eefedd113cadb47cd4bf6365854353338ea (diff) | |
| download | uca-8141f8527435e86f47bd89c797a3811aa99cb840.tar.gz uca-8141f8527435e86f47bd89c797a3811aa99cb840.tar.bz2 uca-8141f8527435e86f47bd89c797a3811aa99cb840.tar.xz uca-8141f8527435e86f47bd89c797a3811aa99cb840.zip | |
improve package file naming
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | package.sh.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7e6c47..0d1966c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,8 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "http://ufo.kit.edu/ufo/newticket") set(CPACK_GENERATOR "DEB;RPM") -set(CPACK_PACKAGE_RELEASE 3) -set(CPACK_RPM_PACKAGE_RELEASE 3) +set(CPACK_PACKAGE_RELEASE 1) +set(CPACK_RPM_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE}) 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}) diff --git a/package.sh.in b/package.sh.in index f20e7c1..4bece35 100644 --- a/package.sh.in +++ b/package.sh.in @@ -1,6 +1,6 @@ HEADERS_POSTFIX="devel" PROGRAMS_POSTFIX="tools" -PACKAGE_VERSION="${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}" +PACKAGE_VERSION="${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}-${CPACK_PACKAGE_RELEASE}" cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;executables;/" -D CPACK_PACKAGE_NAME="${CPACK_PACKAGE_NAME}-$PROGRAMS_POSTFIX" -D CPACK_PACKAGE_FILE_NAME="${CPACK_PACKAGE_NAME}-$PACKAGE_VERSION-$PROGRAMS_POSTFIX" |