[gssdp] build: Remove add_global_arguments



commit 881155d323f6ca6af7f06a68b39e3037321d9ca1
Author: Jens Georg <mail jensge org>
Date:   Sat May 22 17:28:35 2021 +0200

    build: Remove add_global_arguments
    
    To be able to use it as a subproject

 examples/meson.build | 4 ++--
 libgssdp/meson.build | 4 +++-
 meson.build          | 4 +---
 tests/meson.build    | 2 ++
 tools/meson.build    | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/examples/meson.build b/examples/meson.build
index 0459334..dad66f9 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,2 +1,2 @@
-executable('test-browser', 'test-browser.c', dependencies : gssdp)
-executable('test-publish', 'test-publish.c', dependencies: gssdp)
+executable('test-browser', 'test-browser.c', dependencies : gssdp, c_args : '-DHAVE_CONFIG_H=1')
+executable('test-publish', 'test-publish.c', dependencies: gssdp, c_args : '-DHAVE_CONFIG_H=1')
diff --git a/libgssdp/meson.build b/libgssdp/meson.build
index 8ecb453..a86ac6c 100644
--- a/libgssdp/meson.build
+++ b/libgssdp/meson.build
@@ -62,7 +62,9 @@ libgssdp = library('gssdp-1.2', sources + enums,
     darwin_versions : darwin_versions,
     dependencies : dependencies + system_deps,
     include_directories : include_directories('..'),
-    install : true)
+    install : true,
+    c_args : '-DHAVE_CONFIG_H=1',
+)
 
 gssdp = declare_dependency(link_with : libgssdp,
                            include_directories: include_directories('..'),
diff --git a/meson.build b/meson.build
index 5bc78af..71b53e7 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gssdp', 'c', version: '1.2.4', meson_version : '>= 0.48.0')
+project('gssdp', 'c', version: '1.2.4', meson_version : '>= 0.54.0')
 gnome = import('gnome')
 pkg = import('pkgconfig')
 
@@ -38,8 +38,6 @@ conf.set('HAVE_SIOCGIFINDEX', siocgifindex_available)
 
 configure_file(output : 'config.h', configuration : conf)
 
-add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c')
-
 system_deps = []
 
 # Check whether we are compiling against Android libc
diff --git a/tests/meson.build b/tests/meson.build
index 09e1e8b..b133e3f 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,9 +1,11 @@
 functional = executable('test-functional',
                         ['test-functional.c', 'test-util.c'],
+                        c_args : '-DHAVE_CONFIG_H=1',
                         dependencies : gssdp)
 
 regression = executable('test-regression',
                         ['test-regression.c', 'test-util.c'],
+                        c_args : '-DHAVE_CONFIG_H=1',
                         dependencies : gssdp)
 
 # Cannot run tests in parallel because both would do UPnP on localhost
diff --git a/tools/meson.build b/tools/meson.build
index bfd44d2..b8275f1 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -12,5 +12,6 @@ sniffer = executable(
     dependencies : [gssdp, gtk],
     install: true,
     export_dynamic : true,
-    gui_app : true
+    gui_app : true,
+    c_args : '-DHAVE_CONFIG_H=1',
 )


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