From e9246d5e4334ae437b00243e1e16184088352718 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 26 Jun 2022 12:55:44 +0900 Subject: [PATCH] Use TDE cmake macro to set version Signed-off-by: Michele Calgaro --- CMakeLists.txt | 13 +++++++++---- ConfigureChecks.cmake | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3aaf801..1dd04ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,11 +44,11 @@ SET (VERSION_MINOR "7") SET (VERSION_PATCH "0") # comment out the next line for a public release #SET (VERSION_SUFFIX "svn") -SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +SET (PACKAGE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) IF(VERSION_SUFFIX) - SET (VERSION "${VERSION}-${VERSION_SUFFIX}") + SET (PACKAGE_VERSION "${PACKAGE_VERSION}-${VERSION_SUFFIX}") ENDIF(VERSION_SUFFIX) -ADD_DEFINITIONS(-D'VERSION="${VERSION}"') +ADD_DEFINITIONS(-D'VERSION="${PACKAGE_VERSION}"') ##### include our cmake modules ################# @@ -56,6 +56,11 @@ ADD_DEFINITIONS(-D'VERSION="${VERSION}"') include( TDEMacros ) +##### set version number ######################## + +tde_set_project_version( ) + + ##### setup install paths ####################### include( TDESetupPaths ) @@ -115,5 +120,5 @@ tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) configure_file( config.h.cmake config.h @ONLY ) # create and install the version file -FILE(WRITE "${CMAKE_BINARY_DIR}/version.txt" "${VERSION}\n") +FILE(WRITE "${CMAKE_BINARY_DIR}/version.txt" "${PACKAGE_VERSION}\n") INSTALL( FILES "${CMAKE_BINARY_DIR}/version.txt" DESTINATION ${DATA_INSTALL_DIR}/rosegarden ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a3c0e21..e364866 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -215,7 +215,7 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -w -fexceptions -DNDEBUG -include tqt.h SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -Wall -fexceptions -DDEBUG -include tqt.h") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -Wall -fexceptions -DDEBUG -include tqt.h") -MESSAGE(STATUS "Rosegarden ${VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}") +MESSAGE(STATUS "Rosegarden ${PACKAGE_VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}") IF(WANT_DEBUG) IF(WANT_FULLDBG)