Skip to content

Commit 77ca25f

Browse files
Kangieppisar
authored andcommitted
meson: switch version compare logic
meson will automatically suppress the warnings about using features from later versions in the `if` statement. This is not the case when the later version features are in `else`. Rewrite the conditional to switch to comparing `>=${NEW_VERSION}` so that meson stops warning the use of newer features than our `meson_version`. Signed-off-by: Matt Jolly <[email protected]>
1 parent 1a19ce7 commit 77ca25f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

modulemd/meson.build

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,13 +284,15 @@ endif
284284
# Test env with release values
285285
test_release_env = environment()
286286
test_release_env.set('LC_ALL', 'C')
287-
if meson.version().version_compare('< 0.56.0')
288-
project_source_root = meson.source_root()
289-
project_build_root = meson.build_root()
290-
else
287+
288+
if meson.version().version_compare('>=0.56.0')
291289
project_source_root = meson.project_source_root()
292290
project_build_root = meson.project_build_root()
291+
else
292+
project_source_root = meson.source_root()
293+
project_build_root = meson.build_root()
293294
endif
295+
294296
test_release_env.set ('MESON_SOURCE_ROOT', project_source_root)
295297
test_release_env.set ('MESON_BUILD_ROOT', project_build_root)
296298
test_release_env.set ('TEST_DATA_PATH', project_source_root + '/modulemd/tests/test_data')

0 commit comments

Comments
 (0)