Be more compatible to older CMake versions

This commit is contained in:
badaix 2021-02-14 13:20:03 +01:00
parent 2c69844cad
commit 1b3e262a5b
3 changed files with 4 additions and 3 deletions

View file

@ -16,7 +16,8 @@ option(UBSAN "Enable UndefinedBehaviorSanitizer" OFF)
option(TIDY "Enable clang tidy" OFF)
IF (REVISION)
add_compile_definitions(REVISION=\"${REVISION}\")
# add_compile_definitions(REVISION=\"${REVISION}\")
add_definitions(-DREVISION=\"${REVISION}\")
ENDIF()
IF (TIDY)

View file

@ -421,7 +421,7 @@ int main(int argc, char** argv)
io_context.stop();
});
LOG(INFO, LOG_TAG) << "Snapclient v" << version::code << (!version::rev().empty() ? (", revision " + version::rev(8)) : ("")) << " started\n";
LOG(INFO, LOG_TAG) << "Version " << version::code << (!version::rev().empty() ? (", revision " + version::rev(8)) : ("")) << "\n";
// Setup metadata handling
auto meta(metaStderr ? std::make_unique<MetaStderrAdapter>() : std::make_unique<MetadataAdapter>());

View file

@ -226,7 +226,7 @@ int main(int argc, char* argv[])
else
throw SnapException("Invalid log sink: " + settings.logging.sink);
LOG(INFO, LOG_TAG) << "Snapserver v" << version::code << (!version::rev().empty() ? (", revision " + version::rev(8)) : ("")) << " started\n";
LOG(INFO, LOG_TAG) << "Version " << version::code << (!version::rev().empty() ? (", revision " + version::rev(8)) : ("")) << "\n";
if (!streamValue->is_set() && !sourceValue->is_set())
settings.stream.sources.push_back(sourceValue->value());