From 7976844b56df674f8d863658336e48aeda131de1 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 25 Sep 2017 12:00:00 -0300 Subject: [PATCH] meson: keysign only when using mono and use a project argument --- ges/meson.build | 4 +--- meson.build | 7 +++++++ sources/meson.build | 4 +--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ges/meson.build b/ges/meson.build index e5a9bd3c19..3429b7bce6 100644 --- a/ges/meson.build +++ b/ges/meson.build @@ -1,13 +1,11 @@ pkg = 'gst-editing-services' raw_api_fname = join_paths(meson.current_source_dir(), pkg + '-api.raw') metadata_fname = join_paths(meson.current_source_dir(), pkg + '.metadata') -snk = join_paths(meson.current_source_dir(), '../', meson.project_name() + '.snk') subdir('generated') ges_sharp = library(pkg + '-sharp', source_gen, - cs_args: ['-nowarn:169', '-nowarn:108', '-nowarn:114', '-unsafe', - '-keyfile:' + snk], + cs_args: ['-nowarn:169', '-nowarn:108', '-nowarn:114', '-unsafe'], link_with: gst_sharp, dependencies: [glib_sharp_dep, gio_sharp_dep]) diff --git a/meson.build b/meson.build index 95bba78b92..8ab94ff84d 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,13 @@ endif gtk_sharp_required_version = '>=3.22.6' +csc = meson.get_compiler('cs') +if csc.get_id() == 'mono' + add_project_arguments('-keyfile:' + join_paths(meson.current_source_dir(), meson.project_name() + '.snk'), + language: ['cs']) +endif + + subproject('gtk-sharp', default_options: ['install=false']) gtk_sharp = subproject('gtk-sharp') diff --git a/sources/meson.build b/sources/meson.build index 3537fd5eff..748d9d55e1 100644 --- a/sources/meson.build +++ b/sources/meson.build @@ -1,6 +1,5 @@ raw_api_fname = join_paths(meson.current_source_dir(), meson.project_name() + '-api.raw') metadata_fname = join_paths(meson.current_source_dir(), meson.project_name() + '.metadata') -snk = join_paths(meson.current_source_dir(), '../', meson.project_name() + '.snk') glueincludes = 'gst/gst.h,gst/app/app.h,gst/audio/audio.h,gst/base/base.h,gst/controller/controller.h,gst/fft/fft.h,gst/net/net.h,gst/pbutils/gstaudiovisualizer.h,gst/pbutils/pbutils.h,gst/rtp/rtp.h,gst/rtsp/rtsp.h,gst/sdp/sdp.h,gst/tag/tag.h,gst/video/video.h' gluefile = join_paths(meson.current_build_dir(), 'generate.c') @@ -37,8 +36,7 @@ sources = [ subdir('generated') gst_sharp = library('gstreamer-sharp', gst_source_gen, sources, - cs_args: ['-nowarn:169', '-nowarn:108', '-nowarn:114', '-unsafe', - '-keyfile:' + snk], + cs_args: ['-nowarn:169', '-nowarn:108', '-nowarn:114', '-unsafe'], dependencies: [glib_sharp_dep, gio_sharp_dep]) gst_sharp_dep = declare_dependency(dependencies: [glib_sharp_dep, gio_sharp_dep],