Revision: 40882
http://brlcad.svn.sourceforge.net/brlcad/?rev=40882&view=rev
Author: starseeker
Date: 2010-09-29 21:02:59 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
And get apr-util building as well.
Modified Paths:
--------------
rt^3/trunk/src/other/subversion/CMakeLists.txt
Added Paths:
-----------
rt^3/trunk/src/other/subversion/other/apr-util/test/Makefile.in
Modified: rt^3/trunk/src/other/subversion/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/other/subversion/CMakeLists.txt 2010-09-29 20:58:22 UTC
(rev 40881)
+++ rt^3/trunk/src/other/subversion/CMakeLists.txt 2010-09-29 21:02:59 UTC
(rev 40882)
@@ -125,7 +125,7 @@
ENDIF(NOT APR_LIBRARY)
IF(NOT APU_LIBRARY)
SET(SUBVERSION_BUILD_LOCAL_APU 1)
- THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT(APU apr-util other/apr-util ""
"")
+ THIRD_PARTY_CONFIGURE_EXTERNAL_PROJECT(APU apr-util other/apr-util ""
"--with-apr=${CMAKE_INSTALL_PREFIX}")
SET(APU_LIBRARY
"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}aprutil-1${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "APU_LIBRARY")
SET(APU_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/apr-1" CACHE
STRING "APU_INCLUDE")
ENDIF(NOT APU_LIBRARY)
Added: rt^3/trunk/src/other/subversion/other/apr-util/test/Makefile.in
===================================================================
--- rt^3/trunk/src/other/subversion/other/apr-util/test/Makefile.in
(rev 0)
+++ rt^3/trunk/src/other/subversion/other/apr-util/test/Makefile.in
2010-09-29 21:02:59 UTC (rev 40882)
@@ -0,0 +1,90 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+# PROGRAMS includes all test programs built on this platform.
+# STDTEST_PORTABLE
+# test programs invoked via standard user interface, run on all platforms
+# ALL_TESTS
+# test modules invoked through the abts suite (./testall)
+# OTHER_PROGRAMS
+# programs such as sockperf, that have to be invoked in a special sequence
+# or with special parameters
+
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
+
+STDTEST_PORTABLE = testall dbd
+
+TESTS = teststrmatch.lo testuri.lo testuuid.lo testbuckets.lo testpass.lo \
+ testmd4.lo testmd5.lo testldap.lo testdate.lo testdbm.lo testdbd.lo \
+ testxml.lo testrmm.lo testreslist.lo testqueue.lo testxlate.lo \
+ testmemcache.lo
+
+PROGRAMS = $(STDTEST_PORTABLE)
+
+TARGETS = $(PROGRAMS)
+
+LOCAL_LIBS = ../l...@aprutil_libname@@[email protected]
+
+CLEAN_TARGETS = manyfile.bin testfile.txt data/sqlite*.db
+
+# bring in rules.mk for standard functionality
+...@include_rules@
+APRUTIL_LIBS = @APRUTIL_LIBS@
+APRUTIL_LDFLAGS = $(ALL_LDFLAGS) @LT_NO_INSTALL@ @APRUTIL_LDFLAGS@
+
+# link programs using -no-install to get real executables not
+# libtool wrapper scripts which link an executable when first run.
+LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) \
+ $(APRUTIL_LDFLAGS) -o $@
+
+# STDTEST_PORTABLE;
+
+abts.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
+ $(srcdir)/testutil.h
+
+testutil.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
+ $(srcdir)/testutil.h
+
+OBJECTS_testall = abts.lo testutil.lo $(TESTS) $(LOCAL_LIBS)
+testall: $(OBJECTS_testall)
+ $(LINK_PROG) $(OBJECTS_testall) $(APRUTIL_LIBS) @LDADD_ldap@
+# For VPATH builds; where we have no ./data, copy us some data
+# if we wait until 'make check', then 'make; ./testall' fails;
+ if test ! -d "./data"; then cp -r $(srcdir)/data data; fi
+
+OBJECTS_dbd = dbd.lo $(LOCAL_LIBS)
+dbd: $(OBJECTS_dbd)
+ $(LINK_PROG) $(OBJECTS_dbd) $(APRUTIL_LIBS)
+
+check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+ teststatus=0; \
+ progfailed=""; \
+ for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
+ if test "$$prog" = 'dbd'; then \
+ for driver in none @apu_dbd_tests@; do \
+ if test "$$driver" != 'none'; then \
+ @apr_shlibpath_...@="`echo
"../dbm/.libs:../dbd/.libs:../ldap/.libs:$...@apr_shlibpath_var@" | sed -e
's/::*$$//'`" \
+ ./$$prog $$driver; \
+ status=$$?; \
+ if test $$status != 0; then \
+ teststatus=$$status; \
+ progfailed="$$progfailed
'$$prog $$driver'"; \
+ fi; \
+ fi; \
+ done; \
+ else \
+ @apr_shlibpath_...@="`echo
"../dbm/.libs:../dbd/.libs:../ldap/.libs:$...@apr_shlibpath_var@" | sed -e
's/::*$$//'`" \
+ ./$$prog; \
+ status=$$?; \
+ if test $$status != 0; then \
+ teststatus=$$status; \
+ progfailed="$$progfailed $$prog"; \
+ fi; \
+ fi; \
+ done; \
+ if test $$teststatus != 0; then \
+ echo "Programs failed:$$progfailed"; \
+ fi; \
+ exit $$teststatus
+
+# DO NOT REMOVE
Property changes on:
rt^3/trunk/src/other/subversion/other/apr-util/test/Makefile.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
