nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consistently use '..._c_args' and '..._vala_args' for meson vars

Browse source
This commit is contained in:
Michael Gratton 2019-09-27 23:56:52 +10:00
parent f5f9350d2f
commit af2915707d
10 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client/meson.build
View file

@ -134,14 +134,14 @@ geary_client_dependencies = [
webkit2gtk,
]
geary_client_vala_options = geary_vala_options
geary_client_vala_args = geary_vala_args
# Enable shared shecondary process if available.
# See issues #558 and #559
webkit_version = webkit2gtk.version().split('.')
if webkit_version[0].to_int() <= 2 and webkit_version[1].to_int() <= 24
message('Enabling WebKitGTK shared process model')
geary_client_vala_options += [
geary_client_vala_args += [
'-D', 'HAS_WEBKIT_SHARED_PROC'
]
endif
@ -151,8 +151,8 @@ geary_client_lib = static_library('geary-client',
geary_client_sources,
dependencies: geary_client_dependencies,
include_directories: config_h_dir,
vala_args: geary_client_vala_options,
c_args: geary_c_options,
vala_args: geary_client_vala_args,
c_args: geary_c_args,
)
geary_client_dep = declare_dependency(

4
src/client/plugin/desktop-notifications/meson.build
View file

@ -9,8 +9,8 @@ shared_module(
plugin_name,
sources: plugin_src,
dependencies: plugin_dependencies,
vala_args: geary_vala_options,
c_args: plugin_cflags,
vala_args: geary_vala_args,
c_args: plugin_c_args,
install: true,
install_dir: plugin_dest
)

2
src/client/plugin/meson.build
View file

@ -20,7 +20,7 @@ plugin_dependencies = [
webkit2gtk,
]
plugin_cflags = geary_c_options
plugin_c_args = geary_c_args
subdir('desktop-notifications')
subdir('messaging-menu')

4
src/client/plugin/messaging-menu/meson.build
View file

@ -28,8 +28,8 @@ if libmessagingmenu_dep.found()
plugin_name + '-geary',
sources: plugin_src,
dependencies: messaging_menu_dependencies,
vala_args: geary_vala_options,
c_args: plugin_cflags,
vala_args: geary_vala_args,
c_args: plugin_c_args,
install: true,
install_dir: plugin_dest
)

4
src/client/plugin/notification-badge/meson.build
View file

@ -13,8 +13,8 @@ if libunity.found()
plugin_name,
sources: plugin_src,
dependencies: badge_dependencies,
vala_args: geary_vala_options,
c_args: plugin_cflags,
vala_args: geary_vala_args,
c_args: plugin_c_args,
install: true,
install_dir: plugin_dest
)

4
src/console/meson.build
View file

@ -14,6 +14,6 @@ geary_console = executable('geary-console',
geary_console_sources,
dependencies: geary_console_dependencies,
include_directories: config_h_dir,
vala_args: geary_vala_options,
c_args: geary_c_options,
vala_args: geary_vala_args,
c_args: geary_c_args,
)

12
src/engine/meson.build
View file

@ -343,21 +343,21 @@ build_dir = meson.current_build_dir()
# Generate internal VAPI for unit testing. See Meson issue
# https://github.com/mesonbuild/meson/issues/1781 for official
# internal VAPI support.
geary_engine_vala_options = geary_vala_options
geary_engine_vala_options += [
geary_engine_vala_args = geary_vala_args
geary_engine_vala_args += [
'--internal-header=@0@/geary-engine-internal.h'.format(build_dir),
'--internal-vapi=@0@/geary-engine-internal.vapi'.format(build_dir)
]
if libunwind_dep.found()
geary_engine_vala_options += [
geary_engine_vala_args += [
'-D', 'HAVE_LIBUNWIND',
]
endif
if get_option('tnef-support')
geary_engine_dependencies += libytnef
geary_engine_vala_options += [
geary_engine_vala_args += [
'-D', 'WITH_TNEF_SUPPORT'
]
endif
@ -366,8 +366,8 @@ geary_engine_lib = static_library('geary-engine',
geary_engine_sources,
dependencies: geary_engine_dependencies,
include_directories: config_h_dir,
vala_args: geary_engine_vala_options,
c_args: geary_c_options,
vala_args: geary_engine_vala_args,
c_args: geary_c_args,
)
# Dummy target to tell Meson about the internal VAPI given the

4
src/mailer/meson.build
View file

@ -13,6 +13,6 @@ geary_mailer = executable('geary-mailer',
geary_mailer_sources,
dependencies: geary_mailer_dependencies,
include_directories: config_h_dir,
vala_args: geary_vala_options,
c_args: geary_c_options,
vala_args: geary_vala_args,
c_args: geary_c_args,
)

14
src/meson.build
View file

@ -1,18 +1,18 @@
# Common vala options
geary_vala_options = [
geary_vala_args = [
'--enable-checking',
]
# Symbols for valac's preprocessor must be defined as compiler args,
# not in the code or in config.h
if reference_tracking
geary_vala_options += [ '--define=REF_TRACKING' ]
geary_vala_args += [ '--define=REF_TRACKING' ]
endif
if not poodle
geary_vala_options += [ '--define=DISABLE_POODLE' ]
geary_vala_args += [ '--define=DISABLE_POODLE' ]
endif
geary_c_options = [
geary_c_args = [
'-include', 'config.h',
# Enable GLib structured logging
'-DG_LOG_USE_STRUCTURED',
@ -39,7 +39,7 @@ geary_web_process_sources = files(
# Web process extension library
geary_web_process = library('geary-web-process',
geary_web_process_sources,
c_args: geary_c_options,
c_args: geary_c_args,
dependencies: [
geary_engine_dep,
gee,
@ -79,8 +79,8 @@ geary_bin_dependencies = [
geary_bin = executable('geary',
geary_bin_sources,
dependencies: geary_bin_dependencies,
vala_args: geary_vala_options,
c_args: geary_c_options,
vala_args: geary_vala_args,
c_args: geary_c_args,
install: true,
)

20
test/meson.build
View file

@ -114,8 +114,8 @@ geary_test_lib = static_library('test-lib',
geary_test_lib_sources,
dependencies: geary_test_lib_dependencies,
include_directories: config_h_dir,
vala_args: geary_vala_options,
c_args: geary_c_options,
vala_args: geary_vala_args,
c_args: geary_c_args,
)
# Engine tests
@ -125,11 +125,11 @@ geary_test_engine_dependencies = [
]
geary_test_engine_dependencies += geary_engine_dependencies
geary_test_engine_vala_options = geary_vala_options
geary_test_engine_vala_args = geary_vala_args
if get_option('tnef-support')
geary_test_engine_dependencies += libytnef
geary_test_engine_vala_options += [
geary_test_engine_vala_args += [
'-D', 'WITH_TNEF_SUPPORT'
]
endif
@ -139,8 +139,8 @@ geary_test_engine_bin = executable('test-engine',
link_with: geary_test_lib,
dependencies: geary_test_engine_dependencies,
include_directories: config_h_dir,
vala_args: geary_test_engine_vala_options,
c_args: geary_c_options,
vala_args: geary_test_engine_vala_args,
c_args: geary_c_args,
)
# Client tests
@ -155,8 +155,8 @@ geary_test_client_bin = executable('test-client',
dependencies: geary_test_client_dependencies,
link_with: geary_test_lib,
include_directories: config_h_dir,
vala_args: geary_vala_options,
c_args: geary_c_options,
vala_args: geary_vala_args,
c_args: geary_c_args,
)
# Integration tests
@ -172,8 +172,8 @@ geary_test_integration_bin = executable('test-integration',
],
link_with: geary_test_lib,
include_directories: config_h_dir,
vala_args: geary_vala_options,
c_args: geary_c_options,
vala_args: geary_vala_args,
c_args: geary_c_args,
)
test('engine-tests', geary_test_engine_bin)