[Pkg-owncloud-commits] [owncloud-client] 36/89: Don't invariably set variables that could be also set externally

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit dd323bc29674ed6f979e1ce31d917855b9e0a1ea
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon Dec 9 19:03:22 2013 +0100

    Don't invariably set variables that could be also set externally
    
    We can't use cached variables here, since at least the suffix
    may change at any  time, and it needs to take precedence over
    any cached content, which cmake doesn't seem to allow for.
---
 VERSION.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/VERSION.cmake b/VERSION.cmake
index ac1f66f..11e25bf 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -3,8 +3,13 @@ set( MIRALL_VERSION_MINOR 5 )
 set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_SOVERSION 0 )
 
-set( MIRALL_VERSION_SUFFIX "beta3" ) # "e.g. beta1, beta2, rc1"
-set( MIRALL_VERSION_BUILD  "0" ) # "Integer ID. Generated by the build system
+if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
+    set( MIRALL_VERSION_SUFFIX "beta3" ) #e.g. beta1, beta2, rc1
+endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
+
+if( NOT DEFINED MIRALL_VERSION_BUILD )
+    set( MIRALL_VERSION_BUILD "0" ) # Integer ID. Generated by the build system
+endif( NOT DEFINED MIRALL_VERSION_BUILD )
 
 # Composite defines
 # Used e.g. for libraries Keep at x.y.z.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git