[glib-networking: 102/129] meson: Apply meson guidelines



commit 90a9767198edccf236bc57b73617b169fb91ab40
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Feb 8 16:12:14 2018 +0100

    meson: Apply meson guidelines
    
    Following the meson porting guidelines[0], this patch renames the
    `with-ca-certificates` build options. The following rules has been
    applied:
    
    - Remove the with prefix from string options.
    - The character separator from multi-word options has been changed
      to underscore.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=793311
    
    [0] https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting

 meson.build       | 4 ++--
 meson_options.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index e733c23..4db3e20 100644
--- a/meson.build
+++ b/meson.build
@@ -111,7 +111,7 @@ config_h.set('G_DISABLE_DEPRECATED', true)
 config_h.set_quoted('G_LOG_DOMAIN', 'GLib-OpenSSL')
 
 if host_machine.system() != 'windows'
-  ca_certificates = get_option('with-ca-certificates')
+  ca_certificates = get_option('ca_certificates')
   if ca_certificates == 'no'
     message('CA certificates disabled')
   else
@@ -119,7 +119,7 @@ if host_machine.system() != 'windows'
       detect_certificates = run_command(join_paths(meson.source_root(), 'build-aux', 
'detect_certificates.py'))
 
       if detect_certificates.returncode() == 1
-        error('Could not find certificates. Use -Dwith-ca-certificates=path to set, or 
-Dwith-ca-certificates=no to disable it')
+        error('Could not find certificates. Use -Dca_certificates=path to set, or -Dca_certificates=no to 
disable it')
       endif
 
       ca_certificates = detect_certificates.stdout().strip()
diff --git a/meson_options.txt b/meson_options.txt
index 6b1c0f7..265f608 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1 +1 @@
-option('with-ca-certificates', type : 'string', value : '', description : 'Path to system Certificate 
Authority list')
+option('ca_certificates', type: 'string', value: '', description: 'Path to system Certificate Authority 
list')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]