VERSION: Add package version to git
This commit is contained in:
@@ -16,8 +16,10 @@ EXECUTE_PROCESS(COMMAND
|
||||
OUTPUT_VARIABLE GIT_DATE
|
||||
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
MESSAGE(STATUS "Git SHA1: ${GIT_SHA1}")
|
||||
MESSAGE(STATUS "Git date: ${GIT_DATE}")
|
||||
FILE(STRINGS ../VERSION PACKAGE_VERSION)
|
||||
MESSAGE(STATUS "Jungfraujoch git SHA1: ${GIT_SHA1}")
|
||||
MESSAGE(STATUS "Jungfraujoch git date: ${GIT_DATE}")
|
||||
MESSAGE(STATUS "Jungfraujoch version: ${PACKAGE_VERSION}")
|
||||
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/GitInfo.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitInfo.cpp" @ONLY)
|
||||
|
||||
|
||||
@@ -9,3 +9,7 @@ std::string jfjoch_git_sha1() {
|
||||
std::string jfjoch_git_date() {
|
||||
return "@GIT_DATE@";
|
||||
}
|
||||
|
||||
std::string jfjoch_version() {
|
||||
return "@PACKAGE_VERSION@";
|
||||
}
|
||||
@@ -7,5 +7,6 @@
|
||||
|
||||
std::string jfjoch_git_sha1();
|
||||
std::string jfjoch_git_date();
|
||||
std::string jfjoch_version();
|
||||
|
||||
#endif //JUNGFRAUJOCH_GITINFO_H
|
||||
|
||||
@@ -16,7 +16,7 @@ Logger::Logger(const std::string &service_name, const std::string &file_name) {
|
||||
sinks.push_back(std::make_shared<spdlog::sinks::daily_file_sink_mt>(file_name, 23, 59));
|
||||
|
||||
spdlog_logger = std::make_shared<spdlog::logger>(service_name, std::begin(sinks), std::end(sinks));
|
||||
spdlog_logger->info("Git sha {} ({})", jfjoch_git_sha1().substr(0, 6), jfjoch_git_date());
|
||||
spdlog_logger->info("Version {} (git {} {})", jfjoch_version(), jfjoch_git_sha1().substr(0, 6), jfjoch_git_date());
|
||||
}
|
||||
|
||||
void Logger::ErrorException(const std::exception &e) {
|
||||
|
||||
Reference in New Issue
Block a user