diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2013-12-09 20:13:32 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2013-12-09 20:16:42 +0400 |
| commit | 1291ffaf021c9f5e91f57cce441a0fd1ad6824f3 (patch) | |
| tree | 2aa506b06df2852a3727448e9a00df830749dfd7 /VERSION.cmake | |
| parent | 89d1e2d924bbc0cf5de818a607eb255daa9a7622 (diff) | |
Small adjustments to the last commit
Diffstat (limited to 'VERSION.cmake')
| -rw-r--r-- | VERSION.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/VERSION.cmake b/VERSION.cmake index 0b6bc189e..ac1f66f30 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -3,8 +3,8 @@ set( MIRALL_VERSION_MINOR 5 ) set( MIRALL_VERSION_PATCH 0 ) set( MIRALL_SOVERSION 0 ) -set( MIRALL_VERSION_SUFFIX "" CACHE STRING "e.g. beta1, beta2, rc1" ) -set( MIRALL_VERSION_BUILD "0" CACHE STRING "Integer ID. Generated by the build system") +set( MIRALL_VERSION_SUFFIX "beta3" ) # "e.g. beta1, beta2, rc1" +set( MIRALL_VERSION_BUILD "0" ) # "Integer ID. Generated by the build system # Composite defines # Used e.g. for libraries Keep at x.y.z. @@ -14,8 +14,8 @@ set( MIRALL_VERSION_FULL ${MIRALL_VERSION} ) set( MIRALL_VERSION_STRING ${MIRALL_VERSION} ) set( MIRALL_VERSION_FULL "${MIRALL_VERSION_FULL}.${MIRALL_VERSION_BUILD}" ) -if( MIRALL_VERSION_SUFFIX ) - set( MIRALL_VERSION_STRING "${MIRALL_VERSION} ${MIRALL_VERSION_SUFFIX} (build ${MIRALL_VERSION_BUILD})" ) -else( MIRALL_VERSION_SUFFIX ) - set( MIRALL_VERSION_STRING "${MIRALL_VERSION} (build ${MIRALL_VERSION_BUILD})" ) -endif( MIRALL_VERSION_SUFFIX ) +set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" ) + +if( MIRALL_VERSION_BUILD ) + set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" ) +endif( MIRALL_VERSION_BUILD ) |