hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add version to VERSION.cmake filename

Browse Source 
The VERSION.cmake file now includes the major and minor versions in the
filename. This will prevent merge conflicts when merging changes upstream.
This commit is contained in:
Markus Mäkelä
2017-06-15 10:13:19 +03:00
parent 673eb3d500
commit ce8d712b46
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
VERSION.cmake
View File

@ -1,14 +0,0 @@
# MaxScale version for CMake
#
# This file contains cache values for CMake which control MaxScale's version
# number.
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "0" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "6" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")