Git release versioning (#163)

* corrected versions to fit release versioning

* fixed comments
This commit is contained in:
Kjell Hedström 2017-03-29 11:25:23 -06:00 committed by GitHub
parent 6e77118706
commit 66a3d5ec0f
2 changed files with 5 additions and 2 deletions

View File

@ -19,8 +19,8 @@ SET(MAJOR_VERSION 1)
IF (NOT DEFINED ${VERSION})
MESSAGE("Extracting git software version")
execute_process(COMMAND bash "-c" "git rev-list --branches HEAD | wc -l | tr -d ' ' | tr -d '\n'" OUTPUT_VARIABLE GIT_VERSION)
SET(MINOR_VERSION ${GIT_VERSION})
SET(BUILD_NUMBER 0)
SET(MINOR_VERSION 2)
SET(BUILD_NUMBER ${GIT_VERSION})
SET(VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_NUMBER})
ENDIF()
MESSAGE("Software Version: ${VERSION}")

View File

@ -11,10 +11,13 @@
#
# ``G3LOG_INCLUDE_DIRS``
# where to find g3log.hpp, etc.
#
# ``G3LOG_LIBRARIES``
# the libraries to link against to use libg3logger.
#
# that includes libg3logger library files.
# ``G3LOG_FOUND``
#
# If false, do not try to use G3LOG.
include(FindPackageHandleStandardArgs)
find_path(G3LOG_INCLUDE_DIR g3log/g3log.hpp)