wlroots: build from subproject first before finding as dependency v2 APPLIED

Pedro Lucas Porcellis: 1
 wlroots: build from subproject first before finding as dependency

 2 files changed, 11 insertions(+), 4 deletions(-)

[PATCH v2] wlroots: build from subproject first before finding as dependency Export this patch

This allows us to set kaiju to track wlroots upstream and always be
up-to-date with the latest work on it.
---

v1 -> v2: bundled .gitignore into this patch, removed the -pedantic flag
and set wlroots' warning_level to 2 (kaiju's warning_level is 3
already) and set to track wlroots 0.15.0.

 .gitignore  |  1 +
 meson.build | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..541b073
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+subprojects
diff --git a/meson.build b/meson.build
index 97593de..21840ab 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
 	'c',
 	version: '0.1',
 	license: 'MIT',
-	meson_version: '>=0.54.0',
+	meson_version: '>=0.60.0',
 	default_options: [
 		'c_std=c11',
 		'warning_level=3',
@@ -22,7 +22,6 @@ add_project_arguments(
 cc = meson.get_compiler('c')
 
 add_project_arguments(cc.get_supported_arguments([
-	'-pedantic',
 	'-Wundef',
 	'-Wlogical-op',
 	'-Wmissing-include-dirs',
@@ -47,12 +46,19 @@ add_project_arguments(cc.get_supported_arguments([
 	'-Wno-unused-parameter',
 ]), language: 'c')
 
+wlroots_version = ['>=0.15.0', '<0.16.0']
+subproject(
+	'wlroots',
+	default_options: ['warning_level=2', 'examples=false'],
+	required: false,
+	version: wlroots_version,
+)
+
 wayland_server = dependency('wayland-server')
 wayland_client = dependency('wayland-client')
 wayland_protos = dependency('wayland-protocols', version: '>=1.17')
-wlroots = dependency('wlroots')
 xkbcommon = dependency('xkbcommon')
-
+wlroots = dependency('wlroots', version: wlroots_version)
 subdir('protocol')
 
 kaiju_src = files(
-- 
2.34.1

Simon Zeni <simon@bl4ckb0ne.ca>

2 years ago

Applied in d426c6f00d0f2c8e6ef2050e0a621cfd7d6baaa3, thanks :)