From 66a3d5ec0f46fee6d7cdc81a3d011a4e502bead2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= <hedstrom@kjellkod.cc>
Date: Wed, 29 Mar 2017 11:25:23 -0600
Subject: [PATCH] Git release versioning (#163)

* corrected versions to fit release versioning

* fixed comments
---
 CPackLists.txt          | 4 ++--
 cmake/G3LOGConfig.cmake | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CPackLists.txt b/CPackLists.txt
index 2fa5fda..f87b926 100644
--- a/CPackLists.txt
+++ b/CPackLists.txt
@@ -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}")
diff --git a/cmake/G3LOGConfig.cmake b/cmake/G3LOGConfig.cmake
index 069627e..f6e82a0 100644
--- a/cmake/G3LOGConfig.cmake
+++ b/cmake/G3LOGConfig.cmake
@@ -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)