[aravis] build: add a disable-cpp-test configure option.



commit 06ff4cb576eb16f850a7bf58f699d0b221eccbd4
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Thu Apr 19 16:37:39 2012 +0200

    build: add a disable-cpp-test configure option.
    
    It allows to build aravis without a C++ compiler. The C++ test is here
    to ensure aravis headers are compatible with C++.

 configure.ac      |    6 ++++++
 tests/Makefile.am |    5 ++++-
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e6be8e6..8dbb6d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,10 @@ AC_ARG_ENABLE(viewer,
 	      [  --enable-viewer         build viewer],
 	      [enable_viewer=$enableval],
 	      [enable_viewer=no])
+AC_ARG_ENABLE(cpp_test,
+	      [  --disable-cpp-test      disable c++ test],
+	      [enable_cpp_test=$enableval],
+	      [enable_cpp_test=yes])
 
 PKG_PROG_PKG_CONFIG([0.14])
 
@@ -72,6 +76,8 @@ if test "x$enable_gst_plugin" = "xyes"; then
 fi
 AM_CONDITIONAL(ARAVIS_BUILD_GST_PLUGIN, test "x$build_gst_plugin" = "xyes")
 
+AM_CONDITIONAL(ARAVIS_BUILD_CPP_TEST, test "x$enable_cpp_test" = "xyes")
+
 AC_SUBST(ARAVIS_GST_PLUGIN_CFLAGS)
 AC_SUBST(ARAVIS_GST_PLUGIN_LIBS)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a2dc157..ca721cb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,10 @@ arv_camera_test_LDADD = $(test_progs_ldadd)
 arv_heartbeat_test_SOURCES = arvheartbeattest.c
 arv_heartbeat_test_LDADD = $(test_progs_ldadd)
 
-TEST_PROGS += evaluator buffer fake genicam cpp
+TEST_PROGS += evaluator buffer fake genicam
+if ARAVIS_BUILD_CPP_TEST
+TEST_PROGS += cpp
+endif
 
 noinst_PROGRAMS += $(TEST_PROGS)
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]