[gssdp] Revert "build: Remove add_global_arguments"
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gssdp] Revert "build: Remove add_global_arguments"
- Date: Sat, 22 May 2021 16:06:51 +0000 (UTC)
commit 5db7c98d019d2acbd140957cd9168bdfd4f67c7e
Author: Jens Georg <mail jensge org>
Date: Sat May 22 18:04:51 2021 +0200
Revert "build: Remove add_global_arguments"
This reverts commit 881155d323f6ca6af7f06a68b39e3037321d9ca1.
examples/meson.build | 4 ++--
libgssdp/meson.build | 4 +---
meson.build | 4 +++-
tests/meson.build | 2 --
tools/meson.build | 3 +--
5 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/examples/meson.build b/examples/meson.build
index dad66f9..0459334 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,2 +1,2 @@
-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')
+executable('test-browser', 'test-browser.c', dependencies : gssdp)
+executable('test-publish', 'test-publish.c', dependencies: gssdp)
diff --git a/libgssdp/meson.build b/libgssdp/meson.build
index f2f153f..f3d20da 100644
--- a/libgssdp/meson.build
+++ b/libgssdp/meson.build
@@ -62,9 +62,7 @@ libgssdp = library('gssdp-1.2', sources + enums,
darwin_versions : darwin_versions,
dependencies : dependencies + system_deps,
include_directories : include_directories('..'),
- install : true,
- c_args : '-DHAVE_CONFIG_H=1',
-)
+ install : true)
gssdp = declare_dependency(link_with : libgssdp,
include_directories: include_directories('..'),
diff --git a/meson.build b/meson.build
index 71b53e7..5bc78af 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gssdp', 'c', version: '1.2.4', meson_version : '>= 0.54.0')
+project('gssdp', 'c', version: '1.2.4', meson_version : '>= 0.48.0')
gnome = import('gnome')
pkg = import('pkgconfig')
@@ -38,6 +38,8 @@ 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 b133e3f..09e1e8b 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,11 +1,9 @@
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 b8275f1..bfd44d2 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -12,6 +12,5 @@ sniffer = executable(
dependencies : [gssdp, gtk],
install: true,
export_dynamic : true,
- gui_app : true,
- c_args : '-DHAVE_CONFIG_H=1',
+ gui_app : true
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]