[wing/improve-meson: 4/4] meson: fix coding style
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [wing/improve-meson: 4/4] meson: fix coding style
- Date: Thu, 26 Mar 2020 13:56:33 +0000 (UTC)
commit 44dd8810385498a3bf6c2804c925d144981e7826
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date: Thu Mar 26 14:55:26 2020 +0100
meson: fix coding style
meson.build | 18 ++++++++++--------
tests/meson.build | 8 +++++---
wing/meson.build | 44 +++++++++++++++++++++++++-------------------
3 files changed, 40 insertions(+), 30 deletions(-)
---
diff --git a/meson.build b/meson.build
index 04c07a6..543dd61 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,13 @@
-project('wing', 'c',
- version: '0.3.1',
- default_options: [
- 'buildtype=debugoptimized',
- 'warning_level=2'
- ],
- license: 'LGPLv2.1+',
- meson_version: '>= 0.39.0')
+project(
+ 'wing', 'c',
+ version: '0.3.1',
+ default_options: [
+ 'buildtype=debugoptimized',
+ 'warning_level=2'
+ ],
+ license: 'LGPLv2.1+',
+ meson_version: '>= 0.39.0'
+)
wing_version = meson.project_version()
version_array = wing_version.split('.')
diff --git a/tests/meson.build b/tests/meson.build
index 929537a..db9db42 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -5,8 +5,10 @@ unit_tests = [
winsock2_dep = cc.find_library('ws2_32')
foreach unit: unit_tests
- exe = executable(unit, unit + '.c',
- dependencies: [ wing_dep, winsock2_dep ],
- include_directories: wing_inc)
+ exe = executable(
+ unit, unit + '.c',
+ dependencies: [ wing_dep, winsock2_dep ],
+ include_directories: wing_inc
+ )
test(unit, exe, args: [ '--tap', '-k' ])
endforeach
diff --git a/wing/meson.build b/wing/meson.build
index 749f191..1122d50 100644
--- a/wing/meson.build
+++ b/wing/meson.build
@@ -55,29 +55,35 @@ else
wing_link_args = [ '-Wl,-Bsymbolic-functions' ]
endif
-wing = shared_library('wing-@0@'.format(wing_api_version),
- include_directories: core_inc,
- sources: sources,
- version: libversion,
- soversion: soversion,
- install: true,
- dependencies: platform_deps,
- c_args: extra_args + common_cflags + [ '-DG_LOG_DOMAIN="Wing"' ],
- link_args: wing_link_args)
+wing = shared_library(
+ 'wing-@0@'.format(wing_api_version),
+ include_directories: core_inc,
+ sources: sources,
+ version: libversion,
+ soversion: soversion,
+ install: true,
+ dependencies: platform_deps,
+ c_args: extra_args + common_cflags + [ '-DG_LOG_DOMAIN="Wing"' ],
+ link_args: wing_link_args
+)
# Generate pc file
pkgg = import('pkgconfig')
-pkgg.generate(libraries: [ wing ],
- version: libversion,
- name: 'wing',
- filebase: wing_api_name,
- subdirs: wing_api_name,
- description: 'Wing is a library which provides GLib-like API to some Windows API.',
- requires: 'glib-2.0 >= ' + glib_req + ', gobject-2.0 >= ' + glib_req + ', gio-2.0 >= ' +
glib_req)
+pkgg.generate(
+ libraries: [ wing ],
+ version: libversion,
+ name: 'wing',
+ filebase: wing_api_name,
+ subdirs: wing_api_name,
+ description: 'Wing is a library which provides GLib-like API to some Windows API.',
+ requires: 'glib-2.0 >= ' + glib_req + ', gobject-2.0 >= ' + glib_req + ', gio-2.0 >= ' + glib_req
+)
# Internal dependency, for tests and benchmarks
wing_inc = include_directories([ '.', '..' ])
-wing_dep = declare_dependency(link_with: wing,
- include_directories: [ wing_inc ],
- dependencies: platform_deps)
+wing_dep = declare_dependency(
+ link_with: wing,
+ include_directories: [ wing_inc ],
+ dependencies: platform_deps
+)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]