[Cogl] [PATCH 2/8] tests: Don't build test-journal with --disable-glib

Robert Bragg robert at sixbynine.org
Tue Sep 18 07:28:44 PDT 2012


This looks good to land to me:

Reviewed-by: Robert Bragg <robert at linux.intel.com>

thanks,
- Robert

On Mon, Sep 17, 2012 at 8:07 PM, Damien Lespiau
<damien.lespiau at gmail.com> wrote:
> From: Damien Lespiau <damien.lespiau at intel.com>
>
> test-journal needs cogl_glib_source_new() which is not available when
> compiling cogl with --disable-glib.
> ---
>  tests/micro-perf/Makefile.am |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am
> index a8fb1b9..3b64053 100644
> --- a/tests/micro-perf/Makefile.am
> +++ b/tests/micro-perf/Makefile.am
> @@ -11,7 +11,11 @@ test_conformance_CPPFLAGS = \
>         -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\"
>
>
> -noinst_PROGRAMS = test-journal
> +noinst_PROGRAMS =
> +
> +if USE_GLIB
> +noinst_PROGRAMS += test-journal
> +endif
>
>  AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
>
> --
> 1.7.7.5
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl


More information about the Cogl mailing list