[cogl/wip/cogl-1.14: 11/177] tests: Don't build test-journal with --disable-glib
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/cogl-1.14: 11/177] tests: Don't build test-journal with --disable-glib
- Date: Mon, 21 Jan 2013 15:45:51 +0000 (UTC)
commit bf275db2edcd474a502e767ac40b82b5c74d8f4d
Author: Damien Lespiau <damien lespiau intel com>
Date: Sat Sep 15 14:26:18 2012 +0100
tests: Don't build test-journal with --disable-glib
test-journal needs cogl_glib_source_new() which is not available when
compiling cogl with --disable-glib.
Reviewed-by: Robert Bragg <robert linux intel com>
(cherry picked from commit 71fadbbfacad6a7c0ed7b06252d1e5e5dadf66f5)
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 6171ab2..236fc5f 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]