From 1a642a067ac1cfbc738fe91e737ce3f31ff094a7 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Sat, 19 Aug 2023 00:17:04 +0200 Subject: [PATCH] Meson: Cleanup the mysql dependency detection --- meson/mysql/meson.build | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/meson/mysql/meson.build b/meson/mysql/meson.build index 052425ca05..36d6430a03 100644 --- a/meson/mysql/meson.build +++ b/meson/mysql/meson.build @@ -1,12 +1,9 @@ -# MySQL -# Outputs: deps_mysql - -deps_mysql = dependency('libmysql', required: false) -if not deps_mysql.found() - deps_mysql = dependency('libmariadb', required: false) +dep_mysql = dependency('libmysql', required: false) +if not dep_mysql.found() + dep_mysql = dependency('libmariadb', required: false) endif -if not deps_mysql.found() +if not dep_mysql.found() mysql_config = find_program('mysql_config', required: false) if not mysql_config.found() mysql_config = find_program('mariadb_config', required: true) @@ -21,8 +18,15 @@ if not deps_mysql.found() mysql_version_res = run_command(mysql_config, '--cc_version', check: true) mysql_version = mysql_version_res.stdout().strip() - deps_mysql = declare_dependency(compile_args: mysql_cflags, link_args: mysql_ldflags, version: mysql_version) + dep_mysql = declare_dependency( + compile_args: mysql_cflags, + link_args: mysql_ldflags, + version: mysql_version, + ) endif -summary('MySQL/MariaDB', deps_mysql.found(), bool_yn: true, section: 'Configuration') -summary('MySQL/MariaDB Version', deps_mysql.version(), section: 'Configuration') +summary('MySQL/MariaDB', dep_mysql.found(), bool_yn: true, section: 'MySQL') + +if dep_mysql.found() + summary('Version', dep_mysql.version(), section: 'MySQL') +endif -- 2.47.2