Mirror/FairLogger
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairLogger.git synced 2025-10-13 08:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Update version logic

Browse Source
This commit is contained in:
Dennis Klein 2019-06-27 11:23:19 +02:00 committed by Alexey Rybalchenko
parent 8976d98913
commit 27dcf93d7f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -13,10 +13,10 @@ cmake_policy(VERSION 3.9...3.14)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
include(FairLoggerLib) include(FairLoggerLib)
get_git_version(OUTVAR_PREFIX FairLogger) get_git_version()
project(FairLogger VERSION ${FairLogger_VERSION} LANGUAGES C CXX) project(FairLogger VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${FairLogger_GIT_VERSION} from ${FairLogger_DATE}") message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")
set_fairlogger_defaults() set_fairlogger_defaults()
@ -56,7 +56,7 @@ target_include_directories(FairLogger
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
) )
set_target_properties(FairLogger PROPERTIES set_target_properties(FairLogger PROPERTIES
VERSION ${FairLogger_GIT_VERSION} VERSION ${PROJECT_GIT_VERSION}
SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
) )

4
cmake/FairLoggerLib.cmake
View File

@ -37,7 +37,7 @@ function(get_git_version)
cmake_parse_arguments(ARGS "" "DEFAULT_VERSION;DEFAULT_DATE;OUTVAR_PREFIX" "" ${ARGN}) cmake_parse_arguments(ARGS "" "DEFAULT_VERSION;DEFAULT_DATE;OUTVAR_PREFIX" "" ${ARGN})
if(NOT ARGS_OUTVAR_PREFIX) if(NOT ARGS_OUTVAR_PREFIX)
set(ARGS_OUTVAR_PREFIX FairLogger) set(ARGS_OUTVAR_PREFIX PROJECT)
endif() endif()
if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
@ -151,7 +151,7 @@ endmacro()
macro(install_fairlogger_cmake_package) macro(install_fairlogger_cmake_package)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
set(PACKAGE_INSTALL_DESTINATION set(PACKAGE_INSTALL_DESTINATION
${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${FairLogger_GIT_VERSION} ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_GIT_VERSION}
) )
install(EXPORT ${FairLogger_EXPORT_SET} install(EXPORT ${FairLogger_EXPORT_SET}
NAMESPACE ${PROJECT_NAME}:: NAMESPACE ${PROJECT_NAME}::

6
logger/Version.h.in
View File

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* * * *
* This software is distributed under the terms of the * * This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, * * GNU Lesser General Public Licence (LGPL) version 3, *
@ -13,7 +13,7 @@
#define FAIRLOGGER_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ #define FAIRLOGGER_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
#define FAIRLOGGER_VERSION_MINOR @PROJECT_VERSION_MINOR@ #define FAIRLOGGER_VERSION_MINOR @PROJECT_VERSION_MINOR@
#define FAIRLOGGER_VERSION_PATCH @PROJECT_VERSION_PATCH@ #define FAIRLOGGER_VERSION_PATCH @PROJECT_VERSION_PATCH@
#define FAIRLOGGER_GIT_VERSION "@FairLogger_GIT_VERSION@" #define FAIRLOGGER_GIT_VERSION "@PROJECT_GIT_VERSION@"
#define FAIRLOGGER_GIT_DATE "@FairLogger_GIT_DATE@" #define FAIRLOGGER_GIT_DATE "@PROJECT_GIT_DATE@"
#endif // FAIR_LOGGER_VERSION_H #endif // FAIR_LOGGER_VERSION_H