diff --git a/CMakeLists.txt b/CMakeLists.txt index 47ebdd9..c644bd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,11 @@ include( FindPkgConfig ) include( TDEMacros ) +##### set version number ######################## + +tde_set_project_version( ) + + ##### setup install paths ####################### include( TDESetupPaths ) @@ -64,11 +69,10 @@ ENDIF(BUILD_TESTS) ##### versioning ################################ SET(BASE_VERSION 1.0.4) -SET(VERSION "$ENV{KDESVN_VERSION}") -IF(NOT VERSION) - SET(VERSION ${BASE_VERSION}) -ENDIF(NOT VERSION) -SET(KDESVN_VERSION \"${VERSION}\") +SET(KDESVN_VERSION "$ENV{KDESVN_VERSION}") +IF(NOT KDESVN_VERSION) + SET(KDESVN_VERSION ${BASE_VERSION}) +ENDIF(NOT KDESVN_VERSION) ##### configure checks ########################## diff --git a/tdesvn-config.h.in b/tdesvn-config.h.in index 2a394a1..cc55263 100644 --- a/tdesvn-config.h.in +++ b/tdesvn-config.h.in @@ -1,7 +1,7 @@ #ifndef _KDESVN_CONFIG_H #define _KDESVN_CONFIG_H -#cmakedefine VERSION @KDESVN_VERSION@ +#cmakedefine VERSION "@KDESVN_VERSION@" #cmakedefine SQLITE_FOUND #cmakedefine HAS_SETENV