aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2023-05-03 10:08:00 -0400
committerDavid Robillard <d@drobilla.net>2023-05-03 10:14:00 -0400
commitaca5c2512c94b605f3360bea364553e569b72616 (patch)
tree78fe285cca1ab73b654124ea5784d773307d19fc
parente6b135279a6389c1a1e7df31f7ae9795bd0cd0af (diff)
downloadpugl-aca5c2512c94b605f3360bea364553e569b72616.tar.gz
pugl-aca5c2512c94b605f3360bea364553e569b72616.tar.bz2
pugl-aca5c2512c94b605f3360bea364553e569b72616.zip
Use consistent meson formatting everywhere
-rw-r--r--examples/pugl_cairo_demo.app/meson.build8
-rw-r--r--examples/pugl_clipboard_demo.app/meson.build8
-rw-r--r--examples/pugl_cpp_demo.app/meson.build8
-rw-r--r--examples/pugl_cursor_demo.app/meson.build8
-rw-r--r--examples/pugl_embed_demo.app/meson.build8
-rw-r--r--examples/pugl_management_demo.app/meson.build8
-rw-r--r--examples/pugl_shader_demo.app/Resources/meson.build8
-rw-r--r--examples/pugl_shader_demo.app/meson.build16
-rw-r--r--examples/pugl_vulkan_cpp_demo.app/meson.build8
-rw-r--r--examples/pugl_vulkan_demo.app/meson.build8
-rw-r--r--examples/pugl_window_demo.app/meson.build8
-rw-r--r--meson.build29
-rw-r--r--meson/suppressions/meson.build12
13 files changed, 85 insertions, 52 deletions
diff --git a/examples/pugl_cairo_demo.app/meson.build b/examples/pugl_cairo_demo.app/meson.build
index 875229d..04f67c8 100644
--- a/examples/pugl_cairo_demo.app/meson.build
+++ b/examples/pugl_cairo_demo.app/meson.build
@@ -4,8 +4,10 @@
config = configuration_data()
config.set('NAME', 'pugl_cairo_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
subdir('MacOS')
diff --git a/examples/pugl_clipboard_demo.app/meson.build b/examples/pugl_clipboard_demo.app/meson.build
index f62f56c..fdd317d 100644
--- a/examples/pugl_clipboard_demo.app/meson.build
+++ b/examples/pugl_clipboard_demo.app/meson.build
@@ -4,8 +4,10 @@
config = configuration_data()
config.set('NAME', 'pugl_clipboard_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
subdir('MacOS')
diff --git a/examples/pugl_cpp_demo.app/meson.build b/examples/pugl_cpp_demo.app/meson.build
index 8156f8d..6aeade4 100644
--- a/examples/pugl_cpp_demo.app/meson.build
+++ b/examples/pugl_cpp_demo.app/meson.build
@@ -4,8 +4,10 @@
config = configuration_data()
config.set('NAME', 'pugl_cpp_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
subdir('MacOS')
diff --git a/examples/pugl_cursor_demo.app/meson.build b/examples/pugl_cursor_demo.app/meson.build
index 83ee934..e85de21 100644
--- a/examples/pugl_cursor_demo.app/meson.build
+++ b/examples/pugl_cursor_demo.app/meson.build
@@ -4,8 +4,10 @@
config = configuration_data()
config.set('NAME', 'pugl_cursor_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
subdir('MacOS')
diff --git a/examples/pugl_embed_demo.app/meson.build b/examples/pugl_embed_demo.app/meson.build
index 6902ba3..9624dff 100644
--- a/examples/pugl_embed_demo.app/meson.build
+++ b/examples/pugl_embed_demo.app/meson.build
@@ -4,8 +4,10 @@
config = configuration_data()
config.set('NAME', 'pugl_embed_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
subdir('MacOS')
diff --git a/examples/pugl_management_demo.app/meson.build b/examples/pugl_management_demo.app/meson.build
index 380e38d..78e9567 100644
--- a/examples/pugl_management_demo.app/meson.build
+++ b/examples/pugl_management_demo.app/meson.build
@@ -4,8 +4,10 @@
config = configuration_data()
config.set('NAME', 'pugl_management_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
subdir('MacOS')
diff --git a/examples/pugl_shader_demo.app/Resources/meson.build b/examples/pugl_shader_demo.app/Resources/meson.build
index 7659daa..114d940 100644
--- a/examples/pugl_shader_demo.app/Resources/meson.build
+++ b/examples/pugl_shader_demo.app/Resources/meson.build
@@ -10,7 +10,9 @@ shaders = [
]
foreach shader : shaders
- configure_file(input: files('..' / '..' / 'shaders' / shader),
- output: shader,
- copy: true)
+ configure_file(
+ copy: true,
+ input: files('..' / '..' / 'shaders' / shader),
+ output: shader,
+ )
endforeach
diff --git a/examples/pugl_shader_demo.app/meson.build b/examples/pugl_shader_demo.app/meson.build
index d7347b5..5485499 100644
--- a/examples/pugl_shader_demo.app/meson.build
+++ b/examples/pugl_shader_demo.app/meson.build
@@ -4,9 +4,11 @@
config = configuration_data()
config.set('NAME', 'pugl_shader_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
shaders = [
'header_320_es.glsl',
@@ -17,9 +19,11 @@ shaders = [
]
foreach shader : shaders
- configure_file(input: files('..' / 'shaders' / shader),
- output: shader,
- copy: true)
+ configure_file(
+ copy: true,
+ input: files('..' / 'shaders' / shader),
+ output: shader,
+ )
endforeach
subdir('MacOS')
diff --git a/examples/pugl_vulkan_cpp_demo.app/meson.build b/examples/pugl_vulkan_cpp_demo.app/meson.build
index f7ffacb..d55eaa6 100644
--- a/examples/pugl_vulkan_cpp_demo.app/meson.build
+++ b/examples/pugl_vulkan_cpp_demo.app/meson.build
@@ -4,9 +4,11 @@
config = configuration_data()
config.set('NAME', 'pugl_vulkan_cpp_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
shaders = [
'rect.frag.spv',
diff --git a/examples/pugl_vulkan_demo.app/meson.build b/examples/pugl_vulkan_demo.app/meson.build
index b984dd8..aff6ba9 100644
--- a/examples/pugl_vulkan_demo.app/meson.build
+++ b/examples/pugl_vulkan_demo.app/meson.build
@@ -4,8 +4,10 @@
config = configuration_data()
config.set('NAME', 'pugl_vulkan_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
subdir('MacOS')
diff --git a/examples/pugl_window_demo.app/meson.build b/examples/pugl_window_demo.app/meson.build
index 71518aa..90153d2 100644
--- a/examples/pugl_window_demo.app/meson.build
+++ b/examples/pugl_window_demo.app/meson.build
@@ -4,8 +4,10 @@
config = configuration_data()
config.set('NAME', 'pugl_window_demo')
-info_plist = configure_file(configuration: config,
- input: files('../../resources/Info.plist.in'),
- output: 'Info.plist')
+info_plist = configure_file(
+ configuration: config,
+ input: files('../../resources/Info.plist.in'),
+ output: 'Info.plist',
+)
subdir('MacOS')
diff --git a/meson.build b/meson.build
index 6185fde..0255079 100644
--- a/meson.build
+++ b/meson.build
@@ -1,16 +1,19 @@
# Copyright 2021-2023 David Robillard <d@drobilla.net>
# SPDX-License-Identifier: 0BSD OR ISC
-project('pugl', ['c'],
- version: '0.5.3',
- license: 'ISC',
- meson_version: '>= 0.54.0',
- default_options: [
- 'b_ndebug=if-release',
- 'buildtype=release',
- 'c_std=c99',
- 'cpp_std=c++14',
- ])
+project(
+ 'pugl',
+ ['c'],
+ default_options: [
+ 'b_ndebug=if-release',
+ 'buildtype=release',
+ 'c_std=c99',
+ 'cpp_std=c++14',
+ ],
+ license: 'ISC',
+ meson_version: '>= 0.54.0',
+ version: '0.5.3',
+)
pugl_src_root = meson.current_source_dir()
major_version = meson.project_version().split('.')[0]
@@ -45,8 +48,10 @@ if get_option('strict')
endif
# Disable deprecated API which is not used by tests or examples
-add_project_arguments(['-DPUGL_DISABLE_DEPRECATED'],
- language: ['c', 'cpp', 'objc', 'objcpp'])
+add_project_arguments(
+ ['-DPUGL_DISABLE_DEPRECATED'],
+ language: ['c', 'cpp', 'objc', 'objcpp'],
+)
#############
# Platforms #
diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build
index 82d7fe6..9365086 100644
--- a/meson/suppressions/meson.build
+++ b/meson/suppressions/meson.build
@@ -69,8 +69,10 @@ elif cc.get_id() == 'msvc'
]
endif
-add_project_arguments(cc.get_supported_arguments(c_suppressions),
- language: ['c'])
+add_project_arguments(
+ cc.get_supported_arguments(c_suppressions),
+ language: ['c'],
+)
#######
# C++ #
@@ -123,8 +125,10 @@ if is_variable('cpp')
]
endif
- add_project_arguments(cpp.get_supported_arguments(cpp_suppressions),
- language: ['cpp'])
+ add_project_arguments(
+ cpp.get_supported_arguments(cpp_suppressions),
+ language: ['cpp'],
+ )
endif
###############