project: Update meson files

I probably have OCD. Seeing these files
with this poor alignment gives me physical
pain.
This commit is contained in:
Georges Basile Stavracas Neto 2018-05-03 00:45:29 -03:00
parent 36af5e51d1
commit af0186aaf9
11 changed files with 129 additions and 130 deletions

View file

@ -65,7 +65,6 @@ optimized_src = '''
'''
control_center_optimized = get_option('buildtype').contains('optimized') and cc.compiles(optimized_src)
message('whether_optimization is enabled: ' + control_center_optimized.to_string())
if control_center_optimized
common_flags += '-Wp,-D_FORTIFY_SOURCE=2'
@ -282,6 +281,7 @@ output += ' Options \n'
output += ' Documentation .............................. ' + get_option('documentation').to_string() + '\n'
output += ' Tracing .................................... ' + enable_tracing.to_string() + '\n'
output += ' gnome-session libexecdir ................... ' + gnome_session_libexecdir + '\n'
output += ' Optimized .................................. ' + control_center_optimized.to_string() + '\n'
output += ' Panels \n'
output += ' GNOME Bluetooth (Bluetooth panel) .......... ' + host_is_linux_not_s390.to_string() + '\n'
output += ' Cheese (Users panel webcam support) ........ ' + enable_cheese.to_string() + '\n'

View file

@ -86,9 +86,7 @@ panels_libs += static_library(
include_directories : incs,
dependencies : deps,
c_args : cflags,
link_with: [
libwacom_calibrator
]
link_with : [ libwacom_calibrator ]
)
name = 'test-wacom'
@ -101,7 +99,5 @@ executable(
include_directories : incs,
dependencies : deps,
c_args : test_cflags,
link_with: [
libwacom_calibrator_test
]
link_with : [ libwacom_calibrator_test ]
)

View file

@ -38,7 +38,7 @@ libs = [
]
executable(
meson.project_name() + '-search-provider',
'gnome-control-center-search-provider',
sources,
include_directories : top_inc,
dependencies : shell_deps,

View file

@ -141,5 +141,7 @@ libtestshell_dep = declare_dependency(
libtestshell_deps = common_deps + [ libwidgets_dep, libtestshell_dep ]
install_data ('org.gnome.ControlCenter.gschema.xml',
install_dir: control_center_schemadir)
install_data (
'org.gnome.ControlCenter.gschema.xml',
install_dir : control_center_schemadir
)

View file

@ -1,6 +1,6 @@
test_units = [
#'test-timezone',
'test-timezone',
'test-timezone-gfx',
'test-endianess',
]

View file

@ -23,7 +23,8 @@ envs = [
'TOP_BUILDDIR=' + meson.build_root()
]
test('test-network-panel',
test(
'test-network-panel',
find_program('test-network-panel.py'),
env : envs,
timeout : 10