[libdazzle/mcatanzaro/subproject] Fix subproject build with meson 0.50.0
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdazzle/mcatanzaro/subproject] Fix subproject build with meson 0.50.0
- Date: Thu, 21 Mar 2019 15:00:42 +0000 (UTC)
commit a7bbebbf264efb8a2a45eac965111007a9610d19
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Thu Mar 21 09:58:32 2019 -0500
Fix subproject build with meson 0.50.0
meson 0.50.0 gives a fatal error if add_global_arguments() is used in a
subproject. We could easily set -DG_DISABLE_CAST_CHECKS globally only
when not building a subproject, or just set it only for release_args.
Fixes epiphany#699
meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5c05672..fe61219 100644
--- a/meson.build
+++ b/meson.build
@@ -137,8 +137,7 @@ test_link_args = [
]
if not get_option('buildtype').startswith('debug')
# TODO: Maybe reuse 'b_ndebug' option
- add_global_arguments(['-DG_DISABLE_CAST_CHECKS'], language: 'c')
- release_args += [ '-DG_DISABLE_ASSERT' ]
+ release_args += [ '-DG_DISABLE_ASSERT', '-DG_DISABLE_CAST_CHECKS' ]
test_link_args += [
'-Wl,-Bsymbolic',
'-fno-plt',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]