actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #908 from wolfman2000/wolf-version-bump-5-0-10

Browse Source 
Bump up the version to 5.0.10.
This commit is contained in:
Jason Felds
2015-10-27 20:43:47 -04:00
parent 18fabca8a4 63ff523360
commit 4b0b672e30
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.appveyor.yml
+1 -1
View File
@@ -1,4 +1,4 @@
version: 5.0.9.{build}.{branch} version: 5.0.10.{build}.{branch}
environment: environment:
access_token: access_token:
secure: vsDaeFdGCIGlIxWSEdsDomYtr5mKS5IPGHc4NwuDZ5D6mCna0STrDvMZ6IP6mOBK secure: vsDaeFdGCIGlIxWSEdsDomYtr5mKS5IPGHc4NwuDZ5D6mCna0STrDvMZ6IP6mOBK
CMake/SMDefs.cmake
+6 -1
View File
@@ -1,7 +1,7 @@
# Set up version numbers according to the new scheme. # Set up version numbers according to the new scheme.
set(SM_VERSION_MAJOR 5) set(SM_VERSION_MAJOR 5)
set(SM_VERSION_MINOR 0) 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}") set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
execute_process(COMMAND git rev-parse --short HEAD execute_process(COMMAND git rev-parse --short HEAD
@@ -16,10 +16,15 @@ if(NOT (ret STREQUAL "0"))
set(SM_VERSION_GIT_HASH "UNKNOWN") set(SM_VERSION_GIT_HASH "UNKNOWN")
set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}") 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}") set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}")
else()
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() else()
set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}") 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}") set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}")
endif() endif()
endif()
if (CMAKE_MAJOR_VERSION STREQUAL "3") if (CMAKE_MAJOR_VERSION STREQUAL "3")
# Use the CMake 3 approach whenever possible. # Use the CMake 3 approach whenever possible.