diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
| commit | 420839db21e0bb60f6be72f1924af74b0ffe8224 (patch) | |
| tree | 92b5d777f2d52d46da92b9e3793eab05d13f7d4f /CMakeLists.txt | |
| parent | b73c7a9550a39566b881244d95cd0cb2a97e82b3 (diff) | |
| parent | ee6b7a941f7ef7cdcc92c04b80a683d7370f52bd (diff) | |
| download | libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.gz libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.bz2 libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.xz libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.zip | |
Merge remote branch 'origin/1.0' into dexela
Conflicts:
CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c8c7cc..acf0386 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(uca C) set(TARNAME "libuca") -set(UCA_VERSION_MAJOR "0") -set(UCA_VERSION_MINOR "6") -set(UCA_VERSION_PATCH "1") +set(UCA_VERSION_MAJOR "1") +set(UCA_VERSION_MINOR "0") +set(UCA_VERSION_PATCH "2-dev") set(UCA_DESCRIPTION "Unified Camera Access") set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}") @@ -17,7 +17,7 @@ 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 1) +set(CPACK_PACKAGE_RELEASE 3) set(CPACK_DEBIAN_PACKAGE_NAME "libuca") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Matthias Vogelgesang <matthias.vogelgesang@kit.edu>") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${UCA_DESCRIPTION}) |