From 0b482660d5c86f8e151f9e0b14333bc6870b4ae7 Mon Sep 17 00:00:00 2001 From: Michael Schuldt Date: Thu, 3 May 2012 14:37:01 +0200 Subject: [PATCH] CMakeVersion : Introducing default version - If no git repository is available the git describe tags is not working - Introducing fallback to switch to the package version - The definition of ILM_VERSION is still working --- cmake/modules/CMakeVersions.txt | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/cmake/modules/CMakeVersions.txt b/cmake/modules/CMakeVersions.txt index 1b4a17b..d4891db 100644 --- a/cmake/modules/CMakeVersions.txt +++ b/cmake/modules/CMakeVersions.txt @@ -17,18 +17,33 @@ # ############################################################################ -SET( ${PROJECT_NAME}_MAJOR_VERSION 0 ) -SET( ${PROJECT_NAME}_MINOR_VERSION 9 ) -SET( ${PROJECT_NAME}_PATCH_LEVEL 6 ) +set( ${PROJECT_NAME}_MAJOR_VERSION 0 ) +set( ${PROJECT_NAME}_MINOR_VERSION 9 ) +set( ${PROJECT_NAME}_PATCH_LEVEL 6 ) + +set(VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL}) -SET(VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL}) if(NOT DEFINED ILM_VERSION) + execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE RESULT_VAR OUTPUT_VARIABLE ILM_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) -string(REPLACE "-" "_" ILM_VERSION ${ILM_VERSION} ) + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET) + +if(NOT "${RESULT_VAR}" STREQUAL 0) + +message(STATUS "Unable launch automatic version build! Using default version!") +set(ILM_VERSION ${VERSION}) + +else(NOT "${RESULT_VAR}" STREQUAL 0) + +string(REPLACE "-" "_" ILM_VERSION ${ILM_VERSION}) + +endif(NOT "${RESULT_VAR}" STREQUAL 0) + endif(NOT DEFINED ILM_VERSION) - + set(LICENSE "APACHE 2.0") set(GENIVI_PROJECT_VERSION ${VERSION}) -- 2.7.4