From 77b761aca512eed5c8f76dc612584234bac64b81 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sat, 1 Aug 2020 11:28:48 +0200 Subject: [PATCH] [meson] Test possible 'workaround' for meson 0.55 issue Make xcb a non-nested subproject (via simlink). Issue: #1159 --- meson.build | 4 +++- subprojects/xcb | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 120000 subprojects/xcb diff --git a/meson.build b/meson.build index bec08967..9e893842 100644 --- a/meson.build +++ b/meson.build @@ -51,9 +51,11 @@ deps = [ c_compiler.find_library('m', required: false), ] + +gwxcb = subproject('xcb') # XCB stuff deps += [ - subproject('libgwater/xcb').get_variable('libgwater_xcb'), + gwxcb.get_variable('libgwater_xcb'), dependency('xcb-aux'), dependency('xcb-xkb'), dependency('xkbcommon-x11'), diff --git a/subprojects/xcb b/subprojects/xcb new file mode 120000 index 00000000..b916db37 --- /dev/null +++ b/subprojects/xcb @@ -0,0 +1 @@ +libgwater/xcb \ No newline at end of file