Commit 0eb9f4d94d3f9466cd90e9370a79610e2a48db70 - cinnamon-menus

Build: fix the build options (#22) This fixes an issue on newer versions of meson where 'debug' is a reserved word, which causes the build to fail. It also implements the options in meson.build where they were supposed to pass flags to the compiler but did not until now. Stephen Collins authored 5 years ago Clement Lefebvre committed 5 years ago

2 changed file(s) with 17 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all

+14

-0

meson.build less more

35	35	'-DGMENU_I_KNOW_THIS_IS_UNSTABLE',
36	36	]
37	37
	38	if get_option('enable_debug')
	39	c_args += '-DG_ENABLE_DEBUG'
	40	else
	41	c_args += '-DG_DISABLE_ASSERT'
	42	c_args += '-DG_DISABLE_CHECKS'
	43	c_args += '-DG_DISABLE_CAST_CHECKS'
	44	endif
	45
	46	if not get_option('deprecated_warnings')
	47	c_args += '-Wno-deprecated-declarations'
	48	c_args += '-Wno-deprecated'
	49	c_args += '-Wno-declaration-after-statement'
	50	endif
	51
38	52	add_global_arguments(c_args, language: 'c')
39	53
40	54	gio = dependency('gio-unix-2.0', version: '>= 2.29.15')

-3

meson_options.txt less more

0	0	option('deprecated_warnings',
1	1	type: 'boolean',
2		value: false,
	2	value: true,
3	3	description: 'Show build warnings for deprecations'
4	4	)
5		option('debug',
	5	option('enable_debug',
6	6	type: 'boolean',
7		value: false,
	7	value: true,
8	8	description: 'Enable debugging'
9	9	)