Changeset a0ddcf for src/Helpers/unittests

Timestamp:

Apr 6, 2011, 4:05:13 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

2ed1a0

Parents:

624a32

git-author:

Frederik Heber <heber@…> (04/06/11 14:45:10)

git-committer:

Frederik Heber <heber@…> (04/06/11 16:05:13)

Message:

Replaced *_boost_*.m4 by boost.m4 from tsuna.

• ​https://github.com/tsuna/boost.m4/ has a very nice boost m4 macro to check for presence of boost headers and libraries, also setting the rpath correctly.
• required changes in all Makefile.ams as BOOST_... variable names have changed.

File:

• src/Helpers/unittests/Makefile.am (modified) (5 diffs)

src/Helpers/unittests/Makefile.am

@@ -4 +4 @@
 INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
 
-AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_LDFLAGS) 
+AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS) 
 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
@@ -18 +18 @@
 check_PROGRAMS = $(TESTS) 
 noinst_PROGRAMS = $(TESTS)
-
-BOOST_LIB = $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
-TESTLIBS = \
-        ../../libCodePatterns-debug.la \
-        $(BOOST_LIB)
-
 
 AssertUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
@@ -47 +41 @@
         ../Info.hpp
 ChronosUnitTest_LDADD = \
-        $(BOOST_THREAD_LIB)
+        $(BOOST_THREAD_LIBS)
 
 InfoUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
@@ -68 +62 @@
         ../MemDebug.hpp
 InfoUnitTest_LDADD = \
-        $(BOOST_THREAD_LIB)
+        $(BOOST_THREAD_LIBS)
 
 IteratorAdaptorsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
@@ -92 +86 @@
         ../MemDebug.hpp
 LogUnitTest_LDADD = \
-        $(BOOST_THREAD_LIB)
+        $(BOOST_THREAD_LIBS)
 
 RangeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \