diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-10-23 12:00:29 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-03-19 12:33:45 +0000 |
| commit | 4e3bfe0c97c9133b8fd856300e4c2072f4785d8c (patch) | |
| tree | 24050783938b106d31195e1aaae091e7c74f6cb5 /tools | |
| parent | 27113c75f3ed68302558f8916895f1ee5502fb97 (diff) | |
| download | dbus-4e3bfe0c97c9133b8fd856300e4c2072f4785d8c.tar.gz | |
cmake: Fold GObject detection into GLib detection
Everywhere that we want GLib, we also want GObject and GIO. Detecting
GLib and GIO but not GObject makes very little sense anyway, because
GIO depends on GObject.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=105521
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 2876086c..81e05afa 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -261,9 +261,7 @@ case "$ci_buildsys" in set "$@" -D CMAKE_INCLUDE_PATH="${mingw}/include" set "$@" -D CMAKE_LIBRARY_PATH="${mingw}/lib" set "$@" -D EXPAT_LIBRARY="${mingw}/lib/libexpat.dll.a" - set "$@" -D GLIB2_LIBRARIES="${mingw}/lib/libglib-2.0.dll.a" - set "$@" -D GOBJECT_LIBRARIES="${mingw}/lib/libgobject-2.0.dll.a" - set "$@" -D GIO_LIBRARIES="${mingw}/lib/libgio-2.0.dll.a" + set "$@" -D GLIB2_LIBRARIES="${mingw}/lib/libglib-2.0.dll.a ${mingw}/lib/libgobject-2.0.dll.a ${mingw}/lib/libgio-2.0.dll.a" shift # don't run tests yet, Wine needs Xvfb and more # msys2 libraries |