build: pass scylla product to release.cc

In the form of -DSCYLLA_PRODUCT. To be used in the next patch.
This commit is contained in:
Botond Dénes
2024-04-30 06:56:41 -04:00
parent 03818c4aa9
commit 9d2156bd8a
2 changed files with 6 additions and 3 deletions

View File

@@ -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}

View File

@@ -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