[GSW-62] DLT Library version check

1 files changed, 11 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae1b99b..44e7447 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,33 +46,30 @@ PROJECT( automotive-dlt )
 SET( ${PROJECT_NAME}_MAJOR_VERSION 2 )

 SET( ${PROJECT_NAME}_MINOR_VERSION 2 )

 SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )

-set(GENIVI_PROJECT_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL})

 SET( ${PROJECT_NAME}_VERSION_STATE  )

-SET( ${PROJECT_NAME}_REVISION 1666 )

+SET( GENIVI_PROJECT_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL})

 

-# Write version information into include file

 SET( PRINT_MAJOR_VERSION ${${PROJECT_NAME}_MAJOR_VERSION})

 SET( PRINT_MINOR_VERSION ${${PROJECT_NAME}_MINOR_VERSION})

 SET( PRINT_PATCH_LEVEL ${${PROJECT_NAME}_PATCH_LEVEL})

 SET( PRINT_VERSION ${GENIVI_PROJECT_VERSION})

 SET( PRINT_VERSION_STATE ${${PROJECT_NAME}_VERSION_STATE})

-SET( PRINT_VERSION_REVISION ${${PROJECT_NAME}_REVISION})

 

-# Print version information

-MESSAGE("VERSION ${PRINT_VERSION}")

-MESSAGE("VERSION_STATE ${PRINT_VERSION_STATE}")

-MESSAGE("REVISION ${PRINT_VERSION_REVISION}")

+IF(NOT DEFINED PRINT_REVISION)

+	execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 

+	OUTPUT_VARIABLE PRINT_REVISION 

+	OUTPUT_STRIP_TRAILING_WHITESPACE)

+ENDIF(NOT DEFINED PRINT_REVISION)

 

 ##################### RPM CONFIG ########################

-

-SET( GENIVI_RPM_RELEASE "1${SVN_REVISION}")

+SET( GENIVI_RPM_RELEASE "1${IDLT_VERSION}")

 SET( LICENSE "LGPL v2.1 with special exception" )

 SET( SPEC_DIR "package")

 

 #########################################################

 SET(GENIVI_BUILDSYSTEM_AVAILABLE $ENV{GENIVI_BUILDSYSTEM})

 IF(GENIVI_BUILDSYSTEM_AVAILABLE)

-INCLUDE($ENV{GENIVI_BUILDSYSTEM}/cmake_extensions/GeniviCMakeExtensions.cmake)

+	INCLUDE($ENV{GENIVI_BUILDSYSTEM}/cmake_extensions/GeniviCMakeExtensions.cmake)

 ENDIF(GENIVI_BUILDSYSTEM_AVAILABLE)

 

 

@@ -173,8 +170,7 @@ CHECK_FUNCTION_EXISTS( strstr HAVE_FUNC_STRSTR)
 CHECK_FUNCTION_EXISTS( strtol HAVE_FUNC_STRTOL)

 

 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/config.h @ONLY)

-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/svnversion.h.cmake ${CMAKE_SOURCE_DIR}/svnversion.h @ONLY)

-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/version.h.cmake ${CMAKE_SOURCE_DIR}/version.h @ONLY)

+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h.cmake ${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h @ONLY)

 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doxygen.cfg.cmake ${CMAKE_SOURCE_DIR}/doxygen.cfg @ONLY)

 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/automotive-dlt.pc.cmake ${CMAKE_SOURCE_DIR}/automotive-dlt.pc @ONLY)

 #CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/automotive-dlt.spec.cmake ${CMAKE_SOURCE_DIR}/package/automotive-dlt.spec ESCAPE_QUOTES)

@@ -184,6 +180,8 @@ OPTION(ENABLE_BUILD_DOC "Set to ON to build Documentation" OFF)
 

 MESSAGE( STATUS )

 MESSAGE( STATUS "-------------------------------------------------------------------------------" )

+MESSAGE( STATUS "Build for Version ${PRINT_VERSION} build ${PRINT_REVISION}")

+MESSAGE( STATUS "VERSION_STATE ${PRINT_VERSION_STATE}")

 MESSAGE( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )

 MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )

 MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )