Merge pull request #1515 from ZoneMinder/fix_version_problems

Have cmake take the version from the version file
This commit is contained in:
Andrew Bauer 2016-06-07 14:42:38 -05:00
commit f9de3215dd
2 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,7 @@
#
cmake_minimum_required (VERSION 2.6)
project (zoneminder)
set(zoneminder_VERSION "1.30.0")
file (STRINGS "version" zoneminder_VERSION)
# make API version a minor of ZM version
set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")

View File

@ -1 +1 @@
1.29.0
1.30.0