Merge pull request #58 from tiosgz/run_command-nocheck
This commit is contained in:
commit
47fbb7d9ab
1 changed files with 10 additions and 3 deletions
13
meson.build
13
meson.build
|
@ -36,9 +36,16 @@ else
|
||||||
error('git is required to make the version string')
|
error('git is required to make the version string')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip()
|
git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags'], check: false)
|
||||||
git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip()
|
git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
|
||||||
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)
|
if git_commit_hash.returncode() != 0 or git_branch.returncode() != 0
|
||||||
|
error('need the git directory to make the version string')
|
||||||
|
endif
|
||||||
|
|
||||||
|
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(
|
||||||
|
git_commit_hash.stdout().strip(),
|
||||||
|
git_branch.stdout().strip(),
|
||||||
|
)
|
||||||
endif
|
endif
|
||||||
add_project_arguments('-DKIWMI_VERSION=@0@'.format(version), language: 'c')
|
add_project_arguments('-DKIWMI_VERSION=@0@'.format(version), language: 'c')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue