Skip to content

Commit

Permalink
Make building of unit tests conditional (disabled by default)
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5300 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Apr 18, 2006
1 parent bf7611f commit dc85568
Show file tree
Hide file tree
Showing 5 changed files with 261 additions and 126 deletions.
7 changes: 6 additions & 1 deletion Makefile.am
Expand Up @@ -30,8 +30,13 @@ docdatadir = $(datadir)/$(PACKAGE)/doc

docdata_DATA = AUTHORS

if WITH_UNITTESTS
TESTS = tests
endif


if HAVE_QT4
SUBDIRS = src doc tools i18n resources images tests
SUBDIRS = src doc tools i18n resources images $(TESTS)
endif

pkginclude_HEADERS = qgsconfig.h
Expand Down
1 change: 1 addition & 0 deletions build.sh
Expand Up @@ -52,3 +52,4 @@ then
--with-qtdir=$QTDIR \
--with-grass=/usr/lib/grass && make && make install

#--enable-unittests \
12 changes: 6 additions & 6 deletions configure.in
Expand Up @@ -381,15 +381,15 @@ fi
AM_CONDITIONAL([HAVE_EXPAT], [test "$have_expat_lib" = "yes"])

dnl ---------------------------------------------------------------------------
dnl Community registration plugin
dnl unittests
dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(community,
AC_HELP_STRING([--enable-community],
[Enable the community registration plugin (broken!)]),
AC_ARG_ENABLE(unittests,
AC_HELP_STRING([--enable-unittests],
[Enable the compilation of unittests]),
[ac_com=yes], [ac_com=no])
AC_MSG_CHECKING([community registration plugin should be installed (broken)])
AC_MSG_CHECKING([Whether to build unit tests])
AC_MSG_RESULT([$ac_com])
AM_CONDITIONAL([WITH_COMMUNITY], [test "$ac_com" = "yes"])
AM_CONDITIONAL([WITH_UNITTESTS], [test "$ac_com" = "yes"])


dnl ---------------------------------------------------------------------------
Expand Down

0 comments on commit dc85568

Please sign in to comment.