Skip to content

Commit

Permalink
style: Set G_LOG_DOMAIN using format()
Browse files Browse the repository at this point in the history
  • Loading branch information
paysonwallach committed Apr 29, 2021
1 parent 1a18553 commit 92f91e7
Showing 1 changed file with 19 additions and 25 deletions.
44 changes: 19 additions & 25 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ vala = meson.get_compiler('vala')
po_dir = join_paths(meson.current_source_dir(), 'po')
vapi_dir = join_paths(meson.source_root(), 'vapi')

add_project_arguments(
[
'-DGETTEXT_PACKAGE="' + meson.project_name() + '"',
'-w'
],
language:'c'
)

prefix = get_option('prefix')
libdir = join_paths(prefix, get_option('libdir'))
datadir = join_paths(prefix, get_option('datadir'))
Expand All @@ -30,6 +22,20 @@ pkgdatadir = join_paths(datadir, app_id)
pkgpluginslibdir = join_paths(pkglibdir, 'plugins')
pkgpluginsdatadir = join_paths(pkgdatadir, 'plugins')

granite_dep = dependency('granite')
glib_json_dep = dependency('json-glib-1.0')
libnotify_dep = dependency('libnotify')
libpeas_dep = dependency('libpeas-1.0', version: '>=1.1.0')
libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: '>=1.1.0')
libwingpanel_dep = dependency('wingpanel-2.0')
indicators_dir = libwingpanel_dep.get_pkgconfig_variable(
'indicatorsdir',
define_variable : [
'libdir',
libdir
]
)

conf_data = configuration_data()
conf_data.set_quoted('APP_ID', app_id)
conf_data.set_quoted('APP_NAME', app_name)
Expand All @@ -48,23 +54,11 @@ config_dep = declare_dependency(
sources: config_h
)

add_global_arguments(
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
language: 'c'
)

granite_dep = dependency('granite')
glib_json_dep = dependency('json-glib-1.0')
libnotify_dep = dependency('libnotify')
libpeas_dep = dependency('libpeas-1.0', version: '>=1.1.0')
libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: '>=1.1.0')
libwingpanel_dep = dependency('wingpanel-2.0')
indicators_dir = libwingpanel_dep.get_pkgconfig_variable(
'indicatorsdir',
define_variable : [
'libdir',
libdir
]
add_project_arguments([
'-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()),
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
],
language:'c'
)

shared_module(
Expand Down

0 comments on commit 92f91e7

Please sign in to comment.