Ignore:
Timestamp:
Jan 26, 2010, 12:45:41 PM (16 years ago)
Author:
Tillmann Crueger <crueger@…>
Children:
d34341
Parents:
931903 (diff), 16807e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge commit 'heber/Analysis_PairCorrelation' into MenuRefactoring

Conflicts:

Makefile.am
molecuilder/src/Makefile.am
molecuilder/src/builder.cpp
molecuilder/src/unittests/Makefile.am

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/unittests/Makefile.am

    r931903 r41182a  
    66MENUTESTS = ActionSequenceTest
    77
    8 TESTS = ActOnAllUnitTest AnalysisBondsUnitTests AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest BondGraphUnitTest ListOfBondsUnitTest LogUnitTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest StackClassUnitTest VectorUnitTest ${MENUTESTS}
     8TESTS = ActOnAllUnitTest AnalysisBondsUnitTests AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest BondGraphUnitTest InfoUnitTest ListOfBondsUnitTest LogUnitTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest StackClassUnitTest VectorUnitTest ${MENUTESTS}
     9
    910check_PROGRAMS = $(TESTS)
    1011noinst_PROGRAMS = $(TESTS)
    … …  
    2728BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
    2829BondGraphUnitTest_LDADD = ../libmolecuilder.a
     30
     31InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
     32InfoUnitTest_LDADD = ../libmolecuilder.a
    2933
    3034ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp
Note: See TracChangeset for help on using the changeset viewer.