mirror of
https://github.com/swaywm/sway.git
synced 2024-11-10 12:33:50 +01:00
Fix --version when building from tarball
This commit is contained in:
parent
fb4f29289f
commit
cfee167b7b
11
meson.build
11
meson.build
@ -128,12 +128,13 @@ endif
|
||||
|
||||
add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')
|
||||
|
||||
if git.found()
|
||||
git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip()
|
||||
git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip()
|
||||
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)
|
||||
else
|
||||
version = '"@0@"'.format(meson.project_version())
|
||||
if git.found()
|
||||
git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags'])
|
||||
git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD'])
|
||||
if git_commit_hash.returncode() == 0 and git_branch.returncode() == 0
|
||||
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash.stdout().strip(), git_branch.stdout().strip())
|
||||
endif
|
||||
endif
|
||||
add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user