Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    r9d4ff35 rd7d022  
    77
    88include ../../src/Actions/unittests/Makefile.am
    9 include ../../src/Analysis/unittests/Makefile.am
    109include ../../src/Descriptors/unittests/Makefile.am
    11 include ../../src/Element/unittests/Makefile.am
    12 include ../../src/Fragmentation/unittests/Makefile.am
    13 include ../../src/Graph/unittests/Makefile.am
    1410include ../../src/Parser/unittests/Makefile.am
    1511include ../../src/RandomNumbers/unittests/Makefile.am
    1612include ../../src/Shapes/unittests/Makefile.am
    17 include ../../src/Tesselation/unittests/Makefile.am
    1813include ../../src/UIElements/CommandLineUI/unittests/Makefile.am
    1914include ../../src/UIElements/Menu/unittests/Makefile.am
    … …  
    2520
    2621GENERALTESTS = \
     22  AnalysisBondsUnitTest \
     23  AnalysisCorrelationToPointUnitTest \
     24  AnalysisCorrelationToSurfaceUnitTest \
     25  AnalysisPairCorrelationUnitTest \
     26  BondGraphUnitTest \
    2727  BoxUnitTest \
     28  CountBondsUnitTest \
     29  ElementUnitTest \
    2830  FormulaUnittest \
    2931  LinkedCellUnitTest \
    3032  ListOfBondsUnitTest \
     33  PeriodentafelUnitTest \
     34  TesselationUnitTest \
     35  Tesselation_BoundaryTriangleUnitTest \
     36  Tesselation_InOutsideUnitTest \
    3137  WorldTimeUnitTest
    3238
    … …  
    4349        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
    4450
    45 GENERALLIBS = \
    46         ../libMolecuilder.la \
    47         ../libMolecuilderHelpers.la \
    48         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    49         ${CodePatterns_LIBS} \
    50         $(BOOST_LIB)
    51 
    5251ALLLIBS = \
    5352        ../libMolecuilderUI.la \
    … …  
    5958TESTSOURCES = \
    6059        ${ACTIONTESTSSOURCES} \
    61         ${ANALYSISTESTSSOURCES} \
    6260        ${DESCRIPTORTESTSSOURCES} \
    63         ${ELEMENTTESTSSOURCES} \
    64         ${FRAGMENTATIONTESTSSOURCES} \
    65         ${GRAPHTESTSSOURCES} \
    6661        ${LINEARALGEBRATESTSSOURCES} \
    6762        ${PARSERTESTSSOURCES} \
    6863        ${RANDOMNUMBERTESTSSOURCES} \
    6964        ${SHAPETESTSSOURCES} \
    70         ${TESSELATIONTESTSSOURCES} \
    7165        $(UIELEMENTSCOMMANDLINEPARSERTESTSSOURCES) \
    7266        ${UIELEMENTSMENUTESTSSOURCES} \
     67  AnalysisBondsUnitTest.cpp \
     68  AnalysisCorrelationToPointUnitTest.cpp \
     69  AnalysisCorrelationToSurfaceUnitTest.cpp  \
     70  AnalysisPairCorrelationUnitTest.cpp \
     71  BondGraphUnitTest.cpp \
    7372  BoxUnitTest.cpp \
     73  CountBondsUnitTest.cpp \
     74  ElementUnitTest.cpp \
    7475  FormulaUnitTest.cpp \
    7576  LinkedCellUnitTest.cpp \
    7677  ListOfBondsUnitTest.cpp \
     78  PeriodentafelUnitTest.cpp \
     79  TesselationUnitTest.cpp \
     80  Tesselation_BoundaryTriangleUnitTest.cpp \
     81  Tesselation_InsideOutsideUnitTest.cpp \
    7782  WorldTimeUnitTest.cpp
    7883
    7984TESTHEADERS = \
    8085        ${ACTIONTESTSHEADERS} \
    81         ${ANALYSISTESTSHEADERS} \
    8286        ${DESCRIPTORTESTSHEADERS} \
    83         ${ELEMENTTESTSHEADERS} \
    84         ${FRAGMENTATIONTESTSHEADERS} \
    85         ${GRAPHTESTSHEADERS} \
    8687        ${LINEARALGEBRATESTSHEADERS} \
    8788        ${PARSERTESTSHEADERS} \
    8889        ${RANDOMNUMBERTESTSHEADERS} \
    8990        ${SHAPETESTSHEADERS} \
    90         ${TESSELATIONTESTSHEADERS} \
    9191        $(UIELEMENTSCOMMANDLINEPARSERTESTSHEADERS) \
    9292        ${UIELEMENTSMENUTESTSHEADERS} \
     93  AnalysisBondsUnitTest.hpp \
     94  AnalysisCorrelationToPointUnitTest.hpp \
     95  AnalysisCorrelationToSurfaceUnitTest.hpp  \
     96  AnalysisPairCorrelationUnitTest.hpp \
     97  BondGraphUnitTest.hpp \
    9398  BoxUnitTest.hpp \
     99  CountBondsUnitTest.hpp \
     100  ElementUnitTest.hpp \
    94101  FormulaUnitTest.hpp \
    95102  LinkedCellUnitTest.hpp \
    96103  ListOfBondsUnitTest.hpp \
     104  PeriodentafelUnitTest.hpp \
     105  TesselationUnitTest.hpp \
     106  Tesselation_BoundaryTriangleUnitTest.hpp \
     107  Tesselation_InsideOutsideUnitTest.hpp \
    97108  WorldTimeUnitTest.hpp
    98109 
     110
     111AnalysisBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     112        AnalysisBondsUnitTest.cpp \
     113        AnalysisBondsUnitTest.hpp
     114AnalysisBondsUnitTest_LDADD = ${ALLLIBS}
     115
     116AnalysisCorrelationToPointUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     117        AnalysisCorrelationToPointUnitTest.cpp \
     118        AnalysisCorrelationToPointUnitTest.hpp
     119AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
     120
     121AnalysisCorrelationToSurfaceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     122        AnalysisCorrelationToSurfaceUnitTest.cpp \
     123        AnalysisCorrelationToSurfaceUnitTest.hpp
     124AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
     125
     126AnalysisPairCorrelationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     127        AnalysisPairCorrelationUnitTest.cpp \
     128        AnalysisPairCorrelationUnitTest.hpp
     129AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
     130
     131BondGraphUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     132        BondGraphUnitTest.cpp \
     133        BondGraphUnitTest.hpp
     134BondGraphUnitTest_LDADD = ${ALLLIBS}
    99135
    100136BoxUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    101137        BoxUnitTest.cpp \
    102138        BoxUnitTest.hpp
    103 BoxUnitTest_LDADD = \
    104         ../libMolecuilder.la \
    105         ../libMolecuilderShapes.la \
    106         ../libMolecuilderHelpers.la \
    107         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la
     139BoxUnitTest_LDADD = ${ALLLIBS}
     140
     141CountBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     142        CountBondsUnitTest.cpp \
     143        CountBondsUnitTest.hpp
     144CountBondsUnitTest_LDADD = ${ALLLIBS}
     145
     146ElementUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     147        ElementUnitTest.cpp \
     148        ../element.cpp \
     149        ElementUnitTest.hpp \
     150        ../element.hpp
     151ElementUnitTest_LDADD = \
     152        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
    108153
    109154FormulaUnittest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    110155        FormulaUnitTest.cpp \
    111156        FormulaUnitTest.hpp
    112 FormulaUnittest_LDADD = $(ALLLIBS)
     157FormulaUnittest_LDADD = ${ALLLIBS}
    113158
    114159LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    115160        LinkedCellUnitTest.cpp \
    116161        LinkedCellUnitTest.hpp
    117 LinkedCellUnitTest_LDADD = $(ALLLIBS)
     162LinkedCellUnitTest_LDADD = ${ALLLIBS}
    118163
    119164ListOfBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    120165        ListOfBondsUnitTest.cpp \
    121166        ListOfBondsUnitTest.hpp
    122 ListOfBondsUnitTest_LDADD = $(ALLLIBS)
     167ListOfBondsUnitTest_LDADD = ${ALLLIBS}
     168
     169PeriodentafelUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     170        PeriodentafelUnitTest.cpp \
     171        PeriodentafelUnitTest.hpp
     172PeriodentafelUnitTest_LDADD = ${ALLLIBS}
     173
     174TesselationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     175        TesselationUnitTest.cpp \
     176        TesselationUnitTest.hpp
     177TesselationUnitTest_LDADD = ${ALLLIBS}
     178
     179Tesselation_BoundaryTriangleUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     180        Tesselation_BoundaryTriangleUnitTest.cpp \
     181        Tesselation_BoundaryTriangleUnitTest.hpp
     182Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
     183
     184Tesselation_InOutsideUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     185        Tesselation_InsideOutsideUnitTest.cpp \
     186        Tesselation_InsideOutsideUnitTest.hpp
     187Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    123188
    124189WorldTimeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
Note: See TracChangeset for help on using the changeset viewer.