ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1515 from ZoneMinder/fix_version_problems 

Have cmake take the version from the version file
pull/1429/merge
Andrew Bauer 2016-06-07 14:42:38 -05:00
parent 2385575c56 fb6c129f8b
commit f9de3215dd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

2
version
View File

@ -1 +1 @@
1.29.0 1.30.0