From 05df80e5e2b856abf056d69369b5902aa5200d0a Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Thu, 8 May 2014 18:06:31 -0500 Subject: [PATCH] Moved version num to cmake, so it is available both at build and runtime --- src/CMakeLists.txt | 11 +++++++++++ src/openalpr/constants.h | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39ccb77..29d7760 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,6 +3,17 @@ project(src) cmake_minimum_required (VERSION 2.6) +# Set the OpenALPR version in cmake, and also add it as a DEFINE for the code to access +SET(OPENALPR_MAJOR_VERSION "1") +SET(OPENALPR_MINOR_VERSION "1") +SET(OPENALPR_PATCH_VERSION "0") +SET(OPENALPR_VERSION ${OPENALPR_MAJOR_VERSION}.${OPENALPR_MINOR_VERSION}.${OPENALPR_PATCH_VERSION}) + +add_definitions( -DOPENALPR_MAJOR_VERSION=${OPENALPR_MAJOR_VERSION}) +add_definitions( -DOPENALPR_MINOR_VERSION=${OPENALPR_MINOR_VERSION}) +add_definitions( -DOPENALPR_PATCH_VERSION=${OPENALPR_PATCH_VERSION}) + + SET(OpenCV_DIR "${CMAKE_SOURCE_DIR}/../libraries/opencv/") SET(Tesseract_DIR "${CMAKE_SOURCE_DIR}/../libraries/tesseract-ocr") diff --git a/src/openalpr/constants.h b/src/openalpr/constants.h index 497dbd8..0cf137f 100644 --- a/src/openalpr/constants.h +++ b/src/openalpr/constants.h @@ -20,9 +20,6 @@ #define OPENALPR_CONSTANTS_H -#define OPENALPR_MAJOR_VERSION 1 -#define OPENALPR_MINOR_VERSION 1 -#define OPENALPR_PATCH_VERSION 0 #define CONFIG_FILE "/openalpr.conf" #define KEYPOINTS_DIR "/keypoints"