summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYonggang Luo2020-09-15 19:12:21 +0200
committerLaurent Vivier2020-09-16 11:08:00 +0200
commit4b41c9c4a12d9fa3a38f22e5b345666c57bd087d (patch)
tree34a8a2179b28a61a0a9f647c711cd5464703dc63
parentmanual: escape backslashes in "parsed-literal" blocks (diff)
downloadqemu-4b41c9c4a12d9fa3a38f22e5b345666c57bd087d.tar.gz
qemu-4b41c9c4a12d9fa3a38f22e5b345666c57bd087d.tar.xz
qemu-4b41c9c4a12d9fa3a38f22e5b345666c57bd087d.zip
meson: remove empty else and duplicated gio deps
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20200915171234.236-14-luoyonggang@gmail.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
-rw-r--r--meson.build6
1 files changed, 0 insertions, 6 deletions
diff --git a/meson.build b/meson.build
index bba766b4bc..f4d1ab1096 100644
--- a/meson.build
+++ b/meson.build
@@ -317,7 +317,6 @@ opengl = not_found
if 'CONFIG_OPENGL' in config_host
opengl = declare_dependency(compile_args: config_host['OPENGL_CFLAGS'].split(),
link_args: config_host['OPENGL_LIBS'].split())
-else
endif
gtk = not_found
if 'CONFIG_GTK' in config_host
@@ -344,11 +343,6 @@ if 'CONFIG_ICONV' in config_host
iconv = declare_dependency(compile_args: config_host['ICONV_CFLAGS'].split(),
link_args: config_host['ICONV_LIBS'].split())
endif
-gio = not_found
-if 'CONFIG_GIO' in config_host
- gio = declare_dependency(compile_args: config_host['GIO_CFLAGS'].split(),
- link_args: config_host['GIO_LIBS'].split())
-endif
vnc = not_found
png = not_found
jpeg = not_found