Changeset e9e86f for src/Fragmentation


Ignore:
Timestamp:
Aug 20, 2014, 12:59:14 PM (11 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
d93b4b3
Parents:
09806a
git-author:
Frederik Heber <heber@…> (08/17/14 21:31:27)
git-committer:
Frederik Heber <heber@…> (08/20/14 12:59:14)
Message:

FIX: UnitTestMain placed into convenience libUnitTest.

  • removed UnitTestMain.cpp from all .._SOURCES (except LinearAlgebra).
  • this is due to subdir-objects: we cannot use absolute paths anymore. automake tries to place .deps folder in the respective source path. Wrapping it up in a library removes this.
Location:
src/Fragmentation
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • src/Fragmentation/Exporters/unittests/Makefile.am

    r09806a re9e86f  
    2222
    2323FRAGMENTATIONEXPORTERSLIBS = \
     24        libUnitTest.la \
    2425        ../libMolecuilderFragmentation.la \
    2526        ${CodePatterns_LIBS} \
    2627        $(BOOST_LIB)
    2728
    28 HydrogenPoolUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     29HydrogenPoolUnitTest_SOURCES = \
    2930        ../Fragmentation/Exporters/unittests/HydrogenPoolUnitTest.cpp \
    3031        ../Fragmentation/Exporters/unittests/HydrogenPoolUnitTest.hpp
    … …  
    3334        ${FRAGMENTATIONEXPORTERSLIBS}
    3435       
    35 SaturatedFragmentUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     36SaturatedFragmentUnitTest_SOURCES = \
    3637        ../Fragmentation/Exporters/unittests/SaturatedFragmentUnitTest.cpp \
    3738        ../Fragmentation/Exporters/unittests/SaturatedFragmentUnitTest.hpp
    … …  
    4142        ${FRAGMENTATIONEXPORTERSLIBS}
    4243
    43 SaturationDistanceMaximizerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     44SaturationDistanceMaximizerUnitTest_SOURCES = \
    4445        ../Fragmentation/Exporters/unittests/SaturationDistanceMaximizerUnitTest.cpp \
    4546        ../Fragmentation/Exporters/unittests/SaturationDistanceMaximizerUnitTest.hpp \

  • src/Fragmentation/Homology/unittests/Makefile.am

    r09806a re9e86f  
    2525
    2626FRAGMENTATIONHOMOLOGYLIBS = \
     27        libUnitTest.la \
    2728        ../libMolecuilderFragmentationSetValues.la \
    2829        ../libMolecuilderFragmentation.la \
    … …  
    3334        $(BOOST_LIB)
    3435
    35 FragmentEdgeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     36FragmentEdgeUnitTest_SOURCES = \
    3637        ../Fragmentation/Homology/unittests/FragmentEdgeUnitTest.cpp \
    3738        ../Fragmentation/Homology/unittests/FragmentEdgeUnitTest.hpp
    3839FragmentEdgeUnitTest_LDADD = ${FRAGMENTATIONHOMOLOGYLIBS}
    3940
    40 FragmentNodeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     41FragmentNodeUnitTest_SOURCES = \
    4142        ../Fragmentation/Homology/unittests/FragmentNodeUnitTest.cpp \
    4243        ../Fragmentation/Homology/unittests/FragmentNodeUnitTest.hpp
    4344FragmentNodeUnitTest_LDADD = ${FRAGMENTATIONHOMOLOGYLIBS}
    4445       
    45 HomologyContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     46HomologyContainerUnitTest_SOURCES = \
    4647        ../Fragmentation/Homology/unittests/HomologyContainerUnitTest.cpp \
    4748        ../Fragmentation/Homology/unittests/HomologyContainerUnitTest.hpp \
    … …  
    5455        $(BOOST_LIB)
    5556
    56 HomologyGraphUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     57HomologyGraphUnitTest_SOURCES = \
    5758        ../Fragmentation/Homology/unittests/HomologyGraphUnitTest.cpp \
    5859        ../Fragmentation/Homology/unittests/HomologyGraphUnitTest.hpp

  • src/Fragmentation/Summation/Containers/unittests/Makefile.am

    r09806a re9e86f  
    1717
    1818FRAGMENTATIONCONTAINERLIBS = \
     19  libUnitTest.la \
    1920  ../libMolecuilderFragmentationSummation.la \
    2021  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    … …  
    2526MPQCDataUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    2627MPQCDataUnitTest_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    27 MPQCDataUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     28MPQCDataUnitTest_SOURCES = \
    2829  ../Fragmentation/Summation/Containers/unittests/MPQCDataUnitTest.cpp \
    2930  ../Fragmentation/Summation/Containers/unittests/MPQCDataUnitTest.hpp

  • src/Fragmentation/Summation/SetValues/unittests/Makefile.am

    r09806a re9e86f  
    3131
    3232FRAGMENTATIONSETVALUESLIBS = \
     33        libUnitTest.la \
    3334        ../libMolecuilderFragmentationSetValues.la \
    3435        ${CodePatterns_LIBS} \
    3536        $(BOOST_LIB)
    3637
    37 EigenvaluesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     38EigenvaluesUnitTest_SOURCES = \
    3839        ../Fragmentation/Summation/SetValues/unittests/EigenvaluesUnitTest.cpp \
    3940        ../Fragmentation/Summation/SetValues/unittests/EigenvaluesUnitTest.hpp
    … …  
    4243        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
    4344
    44 FragmentUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     45FragmentUnitTest_SOURCES = \
    4546        ../Fragmentation/Summation/SetValues/unittests/FragmentUnitTest.cpp \
    4647        ../Fragmentation/Summation/SetValues/unittests/FragmentUnitTest.hpp
    … …  
    4950        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
    5051
    51 HistogramUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     52HistogramUnitTest_SOURCES = \
    5253        ../Fragmentation/Summation/SetValues/unittests/HistogramUnitTest.cpp \
    5354        ../Fragmentation/Summation/SetValues/unittests/HistogramUnitTest.hpp
    5455HistogramUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
    5556
    56 IndexedVectorsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     57IndexedVectorsUnitTest_SOURCES = \
    5758        ../Fragmentation/Summation/SetValues/unittests/IndexedVectorsUnitTest.cpp \
    5859        ../Fragmentation/Summation/SetValues/unittests/IndexedVectorsUnitTest.hpp
    5960IndexedVectorsUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
    6061
    61 SamplingGridPropertiesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     62SamplingGridPropertiesUnitTest_SOURCES = \
    6263        ../Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.cpp \
    6364        ../Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.hpp
    6465SamplingGridPropertiesUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
    6566
    66 SamplingGridUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     67SamplingGridUnitTest_SOURCES = \
    6768        ../Fragmentation/Summation/SetValues/unittests/SamplingGridUnitTest.cpp \
    6869        ../Fragmentation/Summation/SetValues/unittests/SamplingGridUnitTest.hpp

  • src/Fragmentation/Summation/unittests/Makefile.am

    r09806a re9e86f  
    3434
    3535FRAGMENTATIONSUMMATIONLIBS = \
     36        libUnitTest.la \
    3637        ../libMolecuilderFragmentationSummation.la \
    3738        ${CodePatterns_LIBS} \
    … …  
    3940
    4041
    41 IndexSetUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     42IndexSetUnitTest_SOURCES = \
    4243        ../Fragmentation/Summation/unittests/IndexSetUnitTest.cpp \
    4344        ../Fragmentation/Summation/unittests/IndexSetUnitTest.hpp
    4445IndexSetUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
    4546
    46 IndexSetContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     47IndexSetContainerUnitTest_SOURCES = \
    4748        ../Fragmentation/Summation/unittests/IndexSetContainerUnitTest.cpp \
    4849        ../Fragmentation/Summation/unittests/IndexSetContainerUnitTest.hpp
    … …  
    5354        ${FRAGMENTATIONSUMMATIONLIBS}
    5455
    55 OrthogonalSummationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     56OrthogonalSummationUnitTest_SOURCES = \
    5657        ../Fragmentation/Summation/unittests/OrthogonalSummationUnitTest.cpp \
    5758        ../Fragmentation/Summation/unittests/OrthogonalSummationUnitTest.hpp \
    … …  
    6061OrthogonalSummationUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
    6162
    62 SetValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     63SetValueUnitTest_SOURCES = \
    6364        ../Fragmentation/Summation/unittests/SetValueUnitTest.cpp \
    6465        ../Fragmentation/Summation/unittests/SetValueUnitTest.hpp \
    … …  
    6768SetValueUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
    6869
    69 SetValueMapUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     70SetValueMapUnitTest_SOURCES = \
    7071        ../Fragmentation/Summation/unittests/SetValueMapUnitTest.cpp \
    7172        ../Fragmentation/Summation/unittests/SetValueMapUnitTest.hpp
    7273SetValueMapUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
    7374
    74 SubsetMapUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     75SubsetMapUnitTest_SOURCES = \
    7576        ../Fragmentation/Summation/unittests/SubsetMapUnitTest.cpp \
    7677        ../Fragmentation/Summation/unittests/SubsetMapUnitTest.hpp
    7778SubsetMapUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
    7879
    79 SummationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     80SummationUnitTest_SOURCES = \
    8081        ../Fragmentation/Summation/unittests/SummationUnitTest.cpp \
    8182        ../Fragmentation/Summation/unittests/SummationUnitTest.hpp \

  • src/Fragmentation/unittests/Makefile.am

    r09806a re9e86f  
    1919
    2020FRAGMENTATIONLIBS = \
     21        libUnitTest.la \
    2122        ../libMolecuilderFragmentation.la \
    2223        ../libMolecuilderFragmentation_KeysetsContainer.la \
    … …  
    2627
    2728
    28 KeySetsContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     29KeySetsContainerUnitTest_SOURCES = \
    2930        ../Fragmentation/unittests/KeySetsContainerUnitTest.cpp \
    3031        ../Fragmentation/unittests/KeySetsContainerUnitTest.hpp
    3132KeySetsContainerUnitTest_LDADD = ${FRAGMENTATIONLIBS}
    3233
    33 MatrixContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     34MatrixContainerUnitTest_SOURCES = \
    3435        ../Fragmentation/unittests/MatrixContainerUnitTest.cpp \
    3536        ../Fragmentation/unittests/MatrixContainerUnitTest.hpp
Note: See TracChangeset for help on using the changeset viewer.