mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-10-29 22:25:39 +00:00
meson: remove if conditionals for meson versions less than meson_version
The minimum version is too high to allow these checks to ever be false. We can delete else branches as dead code and remove "if true" constants. Fixes: ``` meson.build:170: WARNING: Conditional on version '>= 0.55.0' always evaluates to true meson.build:232: WARNING: Conditional on version '>= 0.55.0' always evaluates to true ``` Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
This commit is contained in:
1 file changed
+6
-12
+6
-12
@@ -167,11 +167,7 @@ if not (host_machine.system() == 'windows' and get_option('debug'))
|
|||||||
test_ldflags += '-Wl,--dynamicbase'
|
test_ldflags += '-Wl,--dynamicbase'
|
||||||
endif
|
endif
|
||||||
foreach ldflag : test_ldflags
|
foreach ldflag : test_ldflags
|
||||||
if meson.version().version_compare('>= 0.55.0')
|
|
||||||
has_arg = cc.has_link_argument(ldflag)
|
has_arg = cc.has_link_argument(ldflag)
|
||||||
else
|
|
||||||
has_arg = cc.has_argument(ldflag)
|
|
||||||
endif
|
|
||||||
|
|
||||||
if has_arg and cc.links('int main (void) { return 0; }', args: ldflag)
|
if has_arg and cc.links('int main (void) { return 0; }', args: ldflag)
|
||||||
global_ldflags += ldflag
|
global_ldflags += ldflag
|
||||||
@@ -229,23 +225,22 @@ if cc.get_id() != 'msvc'
|
|||||||
meson.add_install_script('meson_post_install.py')
|
meson.add_install_script('meson_post_install.py')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if meson.version().version_compare('>= 0.55.0')
|
summary({
|
||||||
summary({
|
|
||||||
'prefix': get_option('prefix'),
|
'prefix': get_option('prefix'),
|
||||||
'bindir': get_option('bindir'),
|
'bindir': get_option('bindir'),
|
||||||
'libdir': get_option('libdir'),
|
'libdir': get_option('libdir'),
|
||||||
'datadir': get_option('datadir'),
|
'datadir': get_option('datadir'),
|
||||||
}, section: 'Directories')
|
}, section: 'Directories')
|
||||||
|
|
||||||
summary({
|
summary({
|
||||||
'GTK Frontend': get_option('gtk-frontend') ? 'enabled (GTK+ 3.22+)' : 'disabled',
|
'GTK Frontend': get_option('gtk-frontend') ? 'enabled (GTK+ 3.22+)' : 'disabled',
|
||||||
'TLS (openssl)': libssl_dep.found(),
|
'TLS (openssl)': libssl_dep.found(),
|
||||||
'Plugin Support': get_option('plugin'),
|
'Plugin Support': get_option('plugin'),
|
||||||
'DBus Support': dbus_dep.found(),
|
'DBus Support': dbus_dep.found(),
|
||||||
'libcanberra': libcanberra_dep.found(),
|
'libcanberra': libcanberra_dep.found(),
|
||||||
}, section: 'Features')
|
}, section: 'Features')
|
||||||
|
|
||||||
summary({
|
summary({
|
||||||
'Lua': get_option('with-lua'),
|
'Lua': get_option('with-lua'),
|
||||||
'Python': get_option('with-python'),
|
'Python': get_option('with-python'),
|
||||||
'Perl': get_option('with-perl'),
|
'Perl': get_option('with-perl'),
|
||||||
@@ -253,5 +248,4 @@ if meson.version().version_compare('>= 0.55.0')
|
|||||||
'FiSH': get_option('with-fishlim'),
|
'FiSH': get_option('with-fishlim'),
|
||||||
'Sysinfo': get_option('with-sysinfo'),
|
'Sysinfo': get_option('with-sysinfo'),
|
||||||
'DCC Checksum': get_option('with-checksum'),
|
'DCC Checksum': get_option('with-checksum'),
|
||||||
}, section: 'Plugins')
|
}, section: 'Plugins')
|
||||||
endif
|
|
||||||
Reference in new issue
Block a user