meson: Use cdata.set_quoted() for configuration data

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6159>

diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build
index 3d5fbfd8aceb16c9e8bbd51c1551cb8be8925266..0979c6aa0f1b15a9a95674eb70b4def21a615e96 100644 (file)
--- a/subprojects/gst-editing-services/meson.build
+++ b/subprojects/gst-editing-services/meson.build
@@ -82,14 +82,14 @@ if cc.has_argument('-fno-strict-aliasing')
   add_project_arguments('-fno-strict-aliasing', language: 'c')
 endif
 
-cdata.set('VERSION', '"@0@"'.format(gst_version))
-cdata.set('PACKAGE', '"gst-editing-services"')
-cdata.set('PACKAGE_VERSION', '"@0@"'.format(gst_version))
-cdata.set('PACKAGE_BUGREPORT', '"https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/new"')
-cdata.set('PACKAGE_NAME', '"GStreamer Editing Services"')
-cdata.set('GST_PACKAGE_NAME', '"GStreamer Editing Services"')
-cdata.set('GST_PACKAGE_ORIGIN', '"Unknown package origin"')
-cdata.set('GST_LICENSE', '"LGPL"')
+cdata.set_quoted('VERSION', gst_version)
+cdata.set_quoted('PACKAGE', 'gst-editing-services')
+cdata.set_quoted('PACKAGE_VERSION', gst_version)
+cdata.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/new')
+cdata.set_quoted('PACKAGE_NAME', 'GStreamer Editing Services')
+cdata.set_quoted('GST_PACKAGE_NAME', 'GStreamer Editing Services')
+cdata.set_quoted('GST_PACKAGE_ORIGIN', 'Unknown package origin')
+cdata.set_quoted('GST_LICENSE', 'LGPL')
 
 # Mandatory GST deps
 gst_dep = dependency('gstreamer-' + apiversion, version : gst_req,

diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build
index 061a63ae137aff97435a674c304db6fce8785e58..068ada72d05ea3da873f3a1e33b46b7df70c736f 100644 (file)
--- a/subprojects/gst-python/meson.build
+++ b/subprojects/gst-python/meson.build
@@ -103,12 +103,12 @@ message('pygobject overrides directory = @0@'.format(pygi_override_dir))
 libdir = get_option('prefix')+'/'+get_option('libdir')
 
 cdata = configuration_data()
-cdata.set('PACKAGE', '"gst-python"')
-cdata.set('VERSION', '"@0@"'.format(gst_version))
-cdata.set('GST_PACKAGE_NAME', '"GStreamer Python"')
-cdata.set('PACKAGE_NAME', '"GStreamer Python"')
-cdata.set('GST_API_VERSION', '"@0@"'.format(api_version))
-cdata.set('PLUGINDIR', '"@0@/gstreamer-1.0"'.format(libdir))
+cdata.set_quoted('PACKAGE', 'gst-python')
+cdata.set_quoted('VERSION', gst_version)
+cdata.set_quoted('GST_PACKAGE_NAME', 'GStreamer Python')
+cdata.set_quoted('PACKAGE_NAME', 'GStreamer Python')
+cdata.set_quoted('GST_API_VERSION', api_version)
+cdata.set_quoted('PLUGINDIR', join_paths(get_option('prefix'), get_option('libdir'), 'gstreamer-1.0'))
 cdata.set_quoted('PY_LIB_FNAME', pylib_fname)
 configure_file(output : 'config.h', configuration : cdata)
 configinc = include_directories('.')