Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson fixes #621

Merged
merged 2 commits into from
Jan 15, 2025
Merged

meson fixes #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b86ad1d
meson: switch version compare logic
Kangie Dec 11, 2024
d644787
meson: make boolean options boolean
Kangie Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# REMEMBER TO UPDATE THE SUMMARY() IN meson.build when adding options here

option('accept_overflowed_buildorder', type : 'boolean', value: 'false',
option('accept_overflowed_buildorder', type : 'boolean', value: false,
description : 'Accept overflowed 18446744073709551615 buildorder as -1. This breaks a specification, but some RHEL 8 module builds look like that.')

option('verbose_tests', type : 'boolean', value : true,
Expand Down
10 changes: 6 additions & 4 deletions modulemd/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,15 @@ endif
# Test env with release values
test_release_env = environment()
test_release_env.set('LC_ALL', 'C')
if meson.version().version_compare('< 0.56.0')
project_source_root = meson.source_root()
project_build_root = meson.build_root()
else

if meson.version().version_compare('>=0.56.0')
project_source_root = meson.project_source_root()
project_build_root = meson.project_build_root()
else
project_source_root = meson.source_root()
project_build_root = meson.build_root()
endif

test_release_env.set ('MESON_SOURCE_ROOT', project_source_root)
test_release_env.set ('MESON_BUILD_ROOT', project_build_root)
test_release_env.set ('TEST_DATA_PATH', project_source_root + '/modulemd/tests/test_data')
Expand Down
Loading