From b8a017b08195e374bf9a376cfcd9ec8374a40cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 12 Mar 2017 16:28:11 +0000 Subject: [PATCH] meson: use add_project_arguments() instead of add_global_arguments() So Gtk+ can be used as a subproject. --- meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 543aa78faf..195d7ed929 100644 --- a/meson.build +++ b/meson.build @@ -9,16 +9,17 @@ project('gtk+-3.0', 'c', gnome = import('gnome') -add_global_arguments('-DG_LOG_USE_STRUCTURED=1', language: 'c') -add_global_arguments('-DG_ENABLE_DEBUG', language: 'c') -add_global_arguments('-DG_ENABLE_CONSISTENCY_CHECKS', language: 'c') +# FIXME: add GLIB_MIN_REQUIRED_VERSION and GLIB_MAX_ALLOWED_VERSION +add_project_arguments('-DG_LOG_USE_STRUCTURED=1', language: 'c') +add_project_arguments('-DG_ENABLE_DEBUG', language: 'c') +add_project_arguments('-DG_ENABLE_CONSISTENCY_CHECKS', language: 'c') gtk_version = meson.project_version().split('.') gtk_major_version = gtk_version[0].to_int() gtk_minor_version = gtk_version[1].to_int() gtk_micro_version = gtk_version[2].to_int() gtk_interface_age = 0 -add_global_arguments('-DGTK_VERSION="' + meson.project_version() + '"', language: 'c') +add_project_arguments('-DGTK_VERSION="' + meson.project_version() + '"', language: 'c') add_project_arguments('-D_GNU_SOURCE', language : 'c')