diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.com> | 2019-03-22 14:20:51 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2019-06-18 23:39:12 +0300 |
| commit | a60ebf2bd3ffbd8c1de61525114ad54d58f6d1be (patch) | |
| tree | f56ee4df646aa255a23f58441ce8897c5a2e3824 | |
| parent | 0f4d31cefd12fad6f8deabf128439931910e96e5 (diff) | |
| download | weston-a60ebf2bd3ffbd8c1de61525114ad54d58f6d1be.tar.gz | |
meson: link cms-colord with glib and gobject
cms-colord.c calls things like g_string_free() and g_object_unref(), so it
needs to link glib-2.0 and gobject-2.0 explicitly, instead of relying on colord
pkg-config bringing them in.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
(cherry picked from commit 191c453f831d3c955cec9beb8d9f1fc8fafc0e59)
| -rw-r--r-- | compositor/meson.build | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/compositor/meson.build b/compositor/meson.build index d5d7282f..3824d6ff 100644 --- a/compositor/meson.build +++ b/compositor/meson.build @@ -117,11 +117,21 @@ if get_option('color-management-colord') error('cms-colord requires colord >= 0.1.27 which was not found. Or, you can use \'-Dcolor-management-colord=false\'.') endif + plugin_colord_deps = [ dep_libweston, dep_colord ] + + foreach depname : [ 'glib-2.0', 'gobject-2.0' ] + dep = dependency(depname, required: false) + if not dep.found() + error('cms-colord requires \'@0@\' which was not found. If you rather not build this, set \'-Dcolor-management-colord=false\'.'.format(depname)) + endif + plugin_colord_deps += dep + endforeach + plugin_colord = shared_library( 'cms-colord', srcs_colord, include_directories: include_directories('..', '../shared'), - dependencies: [ dep_libweston, dep_colord ], + dependencies: plugin_colord_deps, name_prefix: '', install: true, install_dir: dir_module_weston |