[nemiver/varobjs-support] Conditionally compile test-watchpoint.cc
- From: Dodji Seketeli <dodji src gnome org>
- To: svn-commits-list gnome org
- Subject: [nemiver/varobjs-support] Conditionally compile test-watchpoint.cc
- Date: Thu, 21 May 2009 16:25:12 -0400 (EDT)
commit e5e436932d230a37d4d7820e5d3204cb2619e1cd
Author: Dodji Seketeli <dodji redhat com>
Date: Thu May 21 22:09:36 2009 +0200
Conditionally compile test-watchpoint.cc
* configure.ac: Define the automake VAROBJS variable that is
defined when varobjs support is enabled.
* tests/Makefile.am: Only compile the watchpoint test if varobjs
are supported.
---
configure.ac | 3 +++
tests/Makefile.am | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6347f03..814fed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,9 @@ AC_ARG_ENABLE(varobjs,
if test x$ENABLE_VAROBJS = xyes; then
AC_DEFINE([WITH_VAROBJS], 1, [build with varable objects support])
fi
+
+AM_CONDITIONAL(VAROBJS, test x$ENABLE_VAROBJS = xyes)
+
dnl *******************************
dnl checking for libraries we use
dnl *******************************
diff --git a/tests/Makefile.am b/tests/Makefile.am
index faa6766..94be6a2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,9 @@
+if VAROBJS
+ WATCHPOINT_TEST=runtestwatchpoint
+else
+ WATCHPOINT_TEST=
+endif
+
if AUTOTESTS
# 'make check' automatically runs programs listed in the TESTS variable
@@ -8,7 +14,7 @@ TESTS=\
runtestgdbmi runtestunicode \
runtestvars runtestcpptrait runtestvarlist \
runtestvarwalker runtestbreakpoint \
-runtestwatchpoint runtestderef \
+$(WATCHPOINT_TEST) runtestderef \
runtestlocalvarslist runtestcpplexer \
runtestcppparser \
runtestlibtoolwrapperdetection \
@@ -48,9 +54,11 @@ runtestbreakpoint_SOURCES=test-breakpoint.cc
runtestbreakpoint_LDADD= NEMIVERCOMMON_LIBS@ \
$(top_builddir)/src/common/libnemivercommon.la
+if VAROBJS
runtestwatchpoint_SOURCES=test-watchpoint.cc
runtestwatchpoint_LDADD= NEMIVERCOMMON_LIBS@ \
$(top_builddir)/src/common/libnemivercommon.la
+endif
#runtestoverloads_SOURCES=test-overloads.cc
#runtestoverloads_LDADD= NEMIVERCOMMON_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIB@ \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]