From 63ff52336096a231a6c629b4418f3d60c78a9216 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 27 Oct 2015 20:42:04 -0400 Subject: [PATCH] Bump up the version. ...I am aware of the duplicated variable. That will be fixed for the version after. --- .appveyor.yml | 2 +- CMake/SMDefs.cmake | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2502cd7704..a3a13cca36 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 5.0.9.{build}.{branch} +version: 5.0.10.{build}.{branch} environment: access_token: secure: vsDaeFdGCIGlIxWSEdsDomYtr5mKS5IPGHc4NwuDZ5D6mCna0STrDvMZ6IP6mOBK diff --git a/CMake/SMDefs.cmake b/CMake/SMDefs.cmake index ee5fb6ccb6..749dab5a4a 100644 --- a/CMake/SMDefs.cmake +++ b/CMake/SMDefs.cmake @@ -1,7 +1,7 @@ # Set up version numbers according to the new scheme. set(SM_VERSION_MAJOR 5) set(SM_VERSION_MINOR 0) -set(SM_VERSION_PATCH 9) +set(SM_VERSION_PATCH 10) set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}") execute_process(COMMAND git rev-parse --short HEAD @@ -17,8 +17,13 @@ if(NOT (ret STREQUAL "0")) set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}") set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}") else() - set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}") - set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}") + if (WITH_FULL_RELEASE) + set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}") + set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}") + else() + set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}") + set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}") + endif() endif() if (CMAKE_MAJOR_VERSION STREQUAL "3")