From b788f975b3ca7f092cb906c66722326fac43c281 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 7 Jan 2019 18:48:37 +0100
Subject: meson: use underscore as a separator in build options

This is what https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting suggests.
---
 .gitlab-ci.yml    | 2 +-
 MSVC.README.rst   | 2 +-
 docs/meson.build  | 2 +-
 gir/meson.build   | 6 +++---
 meson.build       | 2 +-
 meson_options.txt | 8 ++++----
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b98e7e42..3afbb3e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ fedora-x86_64-meson:
     CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
     CFLAGS: "-Werror"
   script:
-    - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=true -Dgtk-doc=true -Dcairo=true -Dpython=python3 _build .
+    - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=true -Dgtk_doc=true -Dcairo=true -Dpython=python3 _build .
     - cd _build
     - ninja
     - meson test --print-errorlogs --suite=gobject-introspection --no-suite=glib
diff --git a/MSVC.README.rst b/MSVC.README.rst
index 06cdf75f..42d3b1da 100644
--- a/MSVC.README.rst
+++ b/MSVC.README.rst
@@ -54,7 +54,7 @@ builds is not (and will likely never be) supported.
 Open a Visual Studio command prompt and create an empty build directory (which needs
 to be on the same drive as the G-I sources).  In that directory, run the following::
 
-  python $(PythonInstallationPath)\scripts\meson.py $(G-I_srcdir) --buildtype=<build_configuration> --prefix=$(PREFIX) -Dcairo-libname=<DLL filename of cairo-gobject> -Dpython=<full path to Python interpreter to build _giscanner.pyd>
+  python $(PythonInstallationPath)\scripts\meson.py $(G-I_srcdir) --buildtype=<build_configuration> --prefix=$(PREFIX) -Dcairo_libname=<DLL filename of cairo-gobject> -Dpython=<full path to Python interpreter to build _giscanner.pyd>
 
 The -Dcairo-libname is likely necessary as the default DLL file name for Cairo-GObject
 may likely not match the default "libcairo-gobject-2.dll", which is the default
diff --git a/docs/meson.build b/docs/meson.build
index cebaad8d..6c335874 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,6 +1,6 @@
 install_man('g-ir-compiler.1', 'g-ir-generate.1', 'g-ir-scanner.1')
 install_data('gir-1.2.rnc', install_dir: join_paths(get_option('datadir'), 'gir-1.0'))
 
-if get_option('gtk-doc')
+if get_option('gtk_doc')
   subdir('reference')
 endif
diff --git a/gir/meson.build b/gir/meson.build
index 227af4f8..6b372b74 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -1,6 +1,6 @@
 cairo_conf = configuration_data()
-if get_option('cairo-libname') != ''
-  cairo_library_name = get_option('cairo-libname')
+if get_option('cairo_libname') != ''
+  cairo_library_name = get_option('cairo_libname')
 elif host_machine.system() == 'win32'
   cairo_library_name = 'libcairo-gobject-2.dll'
 elif host_machine.system() == 'darwin'
@@ -98,7 +98,7 @@ if dep_type == 'pkgconfig'
   endif
   glib_headers = ret.stdout().strip().split('\n')
   # Get a list of all source files
-  glib_srcdir = get_option('glib-src-dir')
+  glib_srcdir = get_option('glib_src_dir')
   if glib_srcdir != ''
     ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'glib', '*.c')))
     if ret.returncode() != 0
diff --git a/meson.build b/meson.build
index f661c6f6..6b967783 100644
--- a/meson.build
+++ b/meson.build
@@ -75,7 +75,7 @@ config.set('GI_MINOR_VERSION', gi_versions[1])
 config.set('GI_MICRO_VERSION', gi_versions[2])
 
 config.set_quoted('GIR_SUFFIX', 'gir-1.0')
-gir_dir_prefix = get_option('gir-dir-prefix')
+gir_dir_prefix = get_option('gir_dir_prefix')
 if gir_dir_prefix == ''
     gir_dir_prefix = join_paths(get_option('prefix'), get_option('datadir'))
     gir_dir_pc_prefix = '${datadir}'
diff --git a/meson_options.txt b/meson_options.txt
index 7757a3a1..445a68a4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,15 +6,15 @@ option('doctool', type: 'boolean', value : false,
   description: 'Install g-ir-doc-tool and run related tests'
 )
 
-option('glib-src-dir', type: 'string',
+option('glib_src_dir', type: 'string',
   description: 'Source directory for glib - needed to add docs to gir'
 )
 
-option('gtk-doc', type: 'boolean', value: false,
+option('gtk_doc', type: 'boolean', value: false,
   description: 'Build and install documentation'
 )
 
-option('cairo-libname', type: 'string',
+option('cairo_libname', type: 'string',
   description: 'Custom name for the cairo-gobject library name'
 )
 
@@ -22,6 +22,6 @@ option('python', type: 'string', value: 'python3',
   description: 'Path or name of the Python interpreter to build for'
 )
 
-option('gir-dir-prefix', type: 'string',
+option('gir_dir_prefix', type: 'string',
   description: 'Intermediate prefix for gir installation under ${prefix}'
 )
-- 
cgit v1.2.1