|
Last change
on this file since e71890 was e71890, checked in by Frederik Heber <heber@…>, 16 years ago |
|
Merge branch 'new-delete-conversion' into CodeRefactoring
Conflicts:
molecuilder/src/Makefile.am
molecuilder/src/helpers.cpp
molecuilder/src/helpers.hpp
molecuilder/src/memoryusageobserver.cpp
- FIX: performCriticalExit() was declared static but not defined a such.
- Merge was basically only due to libmolecuilder which was not used in CodeRefactoring branch before.
- added ActOnAll Unit test to new unittests sub folder and to Makefile.am
|
-
Property mode
set to
100644
|
|
File size:
1.4 KB
|
| Line | |
|---|
| 1 | INCLUDES = -I$(top_srcdir)/src
|
|---|
| 2 |
|
|---|
| 3 | noinst_PROGRAMS = ActOnAllTest MemoryAllocatorUnitTest MemoryUsageObserverUnitTest VectorUnitTest
|
|---|
| 4 |
|
|---|
| 5 | TESTS = ActOnAllTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest VectorUnitTest
|
|---|
| 6 | check_PROGRAMS = $(TESTS)
|
|---|
| 7 |
|
|---|
| 8 | ActOnAllTest_SOURCES = ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp memoryallocator.hpp
|
|---|
| 9 | ActOnAllTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
|
|---|
| 10 | ActOnAllTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
|
|---|
| 11 | ActOnAllTest_LDADD = ../libmolecuilder.a
|
|---|
| 12 |
|
|---|
| 13 |
|
|---|
| 14 | VectorUnitTest_SOURCES = defs.hpp helpers.hpp leastsquaremin.hpp memoryallocator.hpp memoryusageobserver.hpp vectorunittest.cpp vectorunittest.hpp vector.hpp verbose.hpp
|
|---|
| 15 | VectorUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
|
|---|
| 16 | VectorUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
|
|---|
| 17 | VectorUnitTest_LDADD = ../libmolecuilder.a
|
|---|
| 18 |
|
|---|
| 19 | MemoryAllocatorUnitTest_SOURCES = defs.hpp helpers.hpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp memoryallocator.hpp memoryusageobserver.hpp verbose.hpp
|
|---|
| 20 | MemoryAllocatorUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS) -I..
|
|---|
| 21 | MemoryAllocatorUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
|
|---|
| 22 | MemoryAllocatorUnitTest_LDADD = ../libmolecuilder.a
|
|---|
| 23 |
|
|---|
| 24 | MemoryUsageObserverUnitTest_SOURCES = defs.hpp helpers.hpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp memoryusageobserver.hpp verbose.hpp
|
|---|
| 25 | MemoryUsageObserverUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
|
|---|
| 26 | MemoryUsageObserverUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
|
|---|
| 27 | MemoryUsageObserverUnitTest_LDADD = ../libmolecuilder.a
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
