From 9d2156bd8a87eb8046f07e7c2006fc16e16c3b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Botond=20D=C3=A9nes?= Date: Tue, 30 Apr 2024 06:56:41 -0400 Subject: [PATCH] build: pass scylla product to release.cc In the form of -DSCYLLA_PRODUCT. To be used in the next patch. --- cmake/add_version_library.cmake | 1 + configure.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/add_version_library.cmake b/cmake/add_version_library.cmake index ccf0063119..e36164539b 100644 --- a/cmake/add_version_library.cmake +++ b/cmake/add_version_library.cmake @@ -69,6 +69,7 @@ function(add_version_library name source) scylla-version-gen) target_compile_definitions(${name} PRIVATE + SCYLLA_PRODUCT=\"${Scylla_PRODUCT}\" SCYLLA_VERSION=\"${Scylla_VERSION}\" SCYLLA_RELEASE=\"${Scylla_RELEASE}\") target_link_libraries(${name} diff --git a/configure.py b/configure.py index ad12cee142..503da16466 100755 --- a/configure.py +++ b/configure.py @@ -1884,9 +1884,11 @@ def get_extra_cxxflags(mode, mode_config, cxx, debuginfo): return cxxflags -def get_release_cxxflags(scylla_version, +def get_release_cxxflags(scylla_product, + scylla_version, scylla_release): - definitions = {'SCYLLA_VERSION': scylla_version, + definitions = {'SCYLLA_PRODUCT': scylla_product, + 'SCYLLA_VERSION': scylla_version, 'SCYLLA_RELEASE': scylla_release} return [f'-D{name}="\\"{value}\\""' for name, value in definitions.items()] @@ -2494,7 +2496,7 @@ def create_build_system(args): extra_cxxflags = ' '.join(get_extra_cxxflags(mode, mode_config, args.cxx, args.debuginfo)) mode_config['cxxflags'] += f' {extra_cxxflags}' - mode_config['per_src_extra_cxxflags']['release.cc'] = ' '.join(get_release_cxxflags(scylla_version, scylla_release)) + mode_config['per_src_extra_cxxflags']['release.cc'] = ' '.join(get_release_cxxflags(scylla_product, scylla_version, scylla_release)) if not args.dist_only: global user_cflags, libs