Changeset a91710 for src/Fragmentation
- Timestamp:
- Aug 21, 2014, 6:59:33 AM (11 years ago)
- 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, Candidate_v1.7.0, Candidate_v1.7.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:
- 29b35e
- Parents:
- 4c9101 (diff), 0c72e2 (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. - Location:
- src/Fragmentation
- Files:
-
- 15 edited
-
Automation/MPQCCommandFragmentController.cpp (modified) (1 diff)
-
Automation/MPQCFragmentController.cpp (modified) (2 diffs)
-
Automation/Makefile.am (modified) (1 diff)
-
Automation/SpecificFragmentController_ReceiveResultContainer_impl.hpp (modified) (1 diff)
-
Exporters/unittests/Makefile.am (modified) (3 diffs)
-
Homology/unittests/Makefile.am (modified) (3 diffs)
-
Interfragmenter.cpp (modified) (2 diffs)
-
Summation/Containers/Makefile.am (modified) (1 diff)
-
Summation/Containers/unittests/Makefile.am (modified) (2 diffs)
-
Summation/Converter/Makefile.am (modified) (1 diff)
-
Summation/Makefile.am (modified) (1 diff)
-
Summation/SetValues/Makefile.am (modified) (1 diff)
-
Summation/SetValues/unittests/Makefile.am (modified) (3 diffs)
-
Summation/unittests/Makefile.am (modified) (5 diffs)
-
unittests/Makefile.am (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/Fragmentation/Automation/MPQCCommandFragmentController.cpp
r4c9101 ra91710 74 74 // job->DoValenceOnly = _DoValenceOnly; 75 75 #ifndef HAVE_JOBMARKET 76 job->setId(getAvailableId()); 76 JobId_t id = getAvailableId(); 77 if (id == (JobId_t)JobId::IllegalJob) { 78 queue.clear(); 79 break; 80 } 81 job->setId(id); 77 82 if (!_executable.empty()) 78 83 job->setCommand(_executable); -
src/Fragmentation/Automation/MPQCFragmentController.cpp
r4c9101 ra91710 67 67 job->DoValenceOnly = _DoValenceOnly; 68 68 JobId_t id = getAvailableId(); 69 if (id == FragmentJob::IllegalJob) {69 if (id == (JobId_t)JobId::IllegalJob) { 70 70 status = false; 71 71 break; … … 74 74 } 75 75 // add the jobs 76 addJobs(newjobs); 76 if (status) 77 addJobs(newjobs); 77 78 status &= (newjobs.size() != 0); 78 79 -
src/Fragmentation/Automation/Makefile.am
r4c9101 ra91710 40 40 noinst_LTLIBRARIES += libMolecuilderFragmentationAutomation.la 41 41 libMolecuilderFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/ 42 libMolecuilderFragmentationAutomation_la_CPPFLAGS = $ {BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)42 libMolecuilderFragmentationAutomation_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS) 43 43 libMolecuilderFragmentationAutomation_la_LDFLAGS = -ldl ${BOOST_LDFLAGS} 44 44 libMolecuilderFragmentationAutomation_la_LIBADD = \ -
src/Fragmentation/Automation/SpecificFragmentController_ReceiveResultContainer_impl.hpp
r4c9101 ra91710 32 32 // convert 33 33 std::vector<T> fragmentData; 34 ConvertFragmentResultTo(fragmentresults, fragmentData); 34 SpecificFragmentController::ReceiveResultContainer<T>::ConvertFragmentResultTo( 35 fragmentresults, 36 fragmentData); 35 37 36 38 // insert into map 37 insertResults(fragmentresults, fragmentData); 39 SpecificFragmentController::ReceiveResultContainer<T>::insertResults( 40 fragmentresults, 41 fragmentData); 38 42 39 43 return fragmentData.size(); -
src/Fragmentation/Exporters/unittests/Makefile.am
r4c9101 ra91710 22 22 23 23 FRAGMENTATIONEXPORTERSLIBS = \ 24 libUnitTest.la \ 25 ../libMolecuilder.la \ 24 26 ../libMolecuilderFragmentation.la \ 25 27 ${CodePatterns_LIBS} \ 26 28 $(BOOST_LIB) 27 29 28 HydrogenPoolUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\30 HydrogenPoolUnitTest_SOURCES = \ 29 31 ../Fragmentation/Exporters/unittests/HydrogenPoolUnitTest.cpp \ 30 32 ../Fragmentation/Exporters/unittests/HydrogenPoolUnitTest.hpp … … 33 35 ${FRAGMENTATIONEXPORTERSLIBS} 34 36 35 SaturatedFragmentUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\37 SaturatedFragmentUnitTest_SOURCES = \ 36 38 ../Fragmentation/Exporters/unittests/SaturatedFragmentUnitTest.cpp \ 37 39 ../Fragmentation/Exporters/unittests/SaturatedFragmentUnitTest.hpp … … 41 43 ${FRAGMENTATIONEXPORTERSLIBS} 42 44 43 SaturationDistanceMaximizerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\45 SaturationDistanceMaximizerUnitTest_SOURCES = \ 44 46 ../Fragmentation/Exporters/unittests/SaturationDistanceMaximizerUnitTest.cpp \ 45 47 ../Fragmentation/Exporters/unittests/SaturationDistanceMaximizerUnitTest.hpp \ -
src/Fragmentation/Homology/unittests/Makefile.am
r4c9101 ra91710 25 25 26 26 FRAGMENTATIONHOMOLOGYLIBS = \ 27 libUnitTest.la \ 28 ../libMolecuilder.la \ 27 29 ../libMolecuilderFragmentationSetValues.la \ 28 30 ../libMolecuilderFragmentation.la \ … … 33 35 $(BOOST_LIB) 34 36 35 FragmentEdgeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\37 FragmentEdgeUnitTest_SOURCES = \ 36 38 ../Fragmentation/Homology/unittests/FragmentEdgeUnitTest.cpp \ 37 39 ../Fragmentation/Homology/unittests/FragmentEdgeUnitTest.hpp 38 40 FragmentEdgeUnitTest_LDADD = ${FRAGMENTATIONHOMOLOGYLIBS} 39 41 40 FragmentNodeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\42 FragmentNodeUnitTest_SOURCES = \ 41 43 ../Fragmentation/Homology/unittests/FragmentNodeUnitTest.cpp \ 42 44 ../Fragmentation/Homology/unittests/FragmentNodeUnitTest.hpp 43 45 FragmentNodeUnitTest_LDADD = ${FRAGMENTATIONHOMOLOGYLIBS} 44 46 45 HomologyContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\47 HomologyContainerUnitTest_SOURCES = \ 46 48 ../Fragmentation/Homology/unittests/HomologyContainerUnitTest.cpp \ 47 49 ../Fragmentation/Homology/unittests/HomologyContainerUnitTest.hpp \ … … 54 56 $(BOOST_LIB) 55 57 56 HomologyGraphUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\58 HomologyGraphUnitTest_SOURCES = \ 57 59 ../Fragmentation/Homology/unittests/HomologyGraphUnitTest.cpp \ 58 60 ../Fragmentation/Homology/unittests/HomologyGraphUnitTest.hpp -
src/Fragmentation/Interfragmenter.cpp
r4c9101 ra91710 136 136 // create a lookup specific to this fragment 137 137 atomkeyset_t fragmentmap; 138 for (candidates_t::const_iterator iter = candidates.begin();139 iter != candidates.end(); ++iter) {140 const atom * _atom = * iter;138 for (candidates_t::const_iterator candidateiter = candidates.begin(); 139 candidateiter != candidates.end(); ++candidateiter) { 140 const atom * _atom = *candidateiter; 141 141 atomkeyset_t::const_iterator iter = atomkeyset.find(_atom); 142 142 ASSERT( iter != atomkeyset.end(), … … 153 153 const atom *_atom = *candidateiter; 154 154 LOG(3, "DEBUG: Current candidate is " << *_atom << "."); 155 atomkeyset_t::iterator iter = fragmentmap.find(_atom);156 ASSERT( iter != fragmentmap.end(),155 atomkeyset_t::iterator finditer = fragmentmap.find(_atom); 156 ASSERT( finditer != fragmentmap.end(), 157 157 "Interfragmenter::operator() - could not find atom " 158 158 +toString(_atom->getId())+" in fragment specific lookup."); 159 keysets_t &othersets = iter->second;159 keysets_t &othersets = finditer->second; 160 160 keysets_t::iterator otheriter = othersets.begin(); 161 161 while (otheriter != othersets.end()) { -
src/Fragmentation/Summation/Containers/Makefile.am
r4c9101 ra91710 41 41 noinst_LTLIBRARIES += libMolecuilderFragmentationContainers.la 42 42 libMolecuilderFragmentationContainers_la_includedir = $(includedir)/MoleCuilder/ 43 libMolecuilderFragmentationContainers_la_CPPFLAGS = $ {BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)43 libMolecuilderFragmentationContainers_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS) 44 44 libMolecuilderFragmentationContainers_la_LDFLAGS = -ldl ${BOOST_LDFLAGS} 45 45 libMolecuilderFragmentationContainers_la_LIBADD = \ -
src/Fragmentation/Summation/Containers/unittests/Makefile.am
r4c9101 ra91710 17 17 18 18 FRAGMENTATIONCONTAINERLIBS = \ 19 libUnitTest.la \ 20 ../libMolecuilder.la \ 19 21 ../libMolecuilderFragmentationSummation.la \ 20 22 $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \ … … 24 26 25 27 MPQCDataUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl 26 MPQCDataUnitTest_CPPFLAGS = $ {BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}27 MPQCDataUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\28 MPQCDataUnitTest_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} 29 MPQCDataUnitTest_SOURCES = \ 28 30 ../Fragmentation/Summation/Containers/unittests/MPQCDataUnitTest.cpp \ 29 31 ../Fragmentation/Summation/Containers/unittests/MPQCDataUnitTest.hpp -
src/Fragmentation/Summation/Converter/Makefile.am
r4c9101 ra91710 10 10 noinst_LTLIBRARIES += libMolecuilderFragmentationConverter.la 11 11 libMolecuilderFragmentationConverter_la_includedir = $(includedir)/MoleCuilder/ 12 libMolecuilderFragmentationConverter_la_CPPFLAGS = $ {BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}12 libMolecuilderFragmentationConverter_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 13 13 libMolecuilderFragmentationConverter_la_LDFLAGS = -ldl ${BOOST_LDFLAGS} 14 14 libMolecuilderFragmentationConverter_la_LIBADD = \ -
src/Fragmentation/Summation/Makefile.am
r4c9101 ra91710 34 34 lib_LTLIBRARIES += libMolecuilderFragmentationSummation.la 35 35 libMolecuilderFragmentationSummation_la_includedir = $(includedir)/MoleCuilder/ 36 libMolecuilderFragmentationSummation_la_CPPFLAGS = $ {BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}36 libMolecuilderFragmentationSummation_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 37 37 libMolecuilderFragmentationSummation_la_LDFLAGS = -ldl \ 38 38 $(BOOST_SERIALIZATION_LDFLAGS) \ -
src/Fragmentation/Summation/SetValues/Makefile.am
r4c9101 ra91710 22 22 noinst_LTLIBRARIES += libMolecuilderFragmentationSetValues.la 23 23 libMolecuilderFragmentationSetValues_la_includedir = $(includedir)/MoleCuilder/ 24 libMolecuilderFragmentationSetValues_la_CPPFLAGS = $ {BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}24 libMolecuilderFragmentationSetValues_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 25 25 libMolecuilderFragmentationSetValues_la_LDFLAGS = -ldl ${BOOST_LDFLAGS} 26 26 libMolecuilderFragmentationSetValues_la_LIBADD = \ -
src/Fragmentation/Summation/SetValues/unittests/Makefile.am
r4c9101 ra91710 31 31 32 32 FRAGMENTATIONSETVALUESLIBS = \ 33 libUnitTest.la \ 34 ../libMolecuilder.la \ 33 35 ../libMolecuilderFragmentationSetValues.la \ 34 36 ${CodePatterns_LIBS} \ 35 37 $(BOOST_LIB) 36 38 37 EigenvaluesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\39 EigenvaluesUnitTest_SOURCES = \ 38 40 ../Fragmentation/Summation/SetValues/unittests/EigenvaluesUnitTest.cpp \ 39 41 ../Fragmentation/Summation/SetValues/unittests/EigenvaluesUnitTest.hpp … … 42 44 $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) 43 45 44 FragmentUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\46 FragmentUnitTest_SOURCES = \ 45 47 ../Fragmentation/Summation/SetValues/unittests/FragmentUnitTest.cpp \ 46 48 ../Fragmentation/Summation/SetValues/unittests/FragmentUnitTest.hpp … … 49 51 $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) 50 52 51 HistogramUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\53 HistogramUnitTest_SOURCES = \ 52 54 ../Fragmentation/Summation/SetValues/unittests/HistogramUnitTest.cpp \ 53 55 ../Fragmentation/Summation/SetValues/unittests/HistogramUnitTest.hpp 54 56 HistogramUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS} 55 57 56 IndexedVectorsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\58 IndexedVectorsUnitTest_SOURCES = \ 57 59 ../Fragmentation/Summation/SetValues/unittests/IndexedVectorsUnitTest.cpp \ 58 60 ../Fragmentation/Summation/SetValues/unittests/IndexedVectorsUnitTest.hpp 59 61 IndexedVectorsUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS} 60 62 61 SamplingGridPropertiesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\63 SamplingGridPropertiesUnitTest_SOURCES = \ 62 64 ../Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.cpp \ 63 65 ../Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.hpp 64 66 SamplingGridPropertiesUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS} 65 67 66 SamplingGridUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\68 SamplingGridUnitTest_SOURCES = \ 67 69 ../Fragmentation/Summation/SetValues/unittests/SamplingGridUnitTest.cpp \ 68 70 ../Fragmentation/Summation/SetValues/unittests/SamplingGridUnitTest.hpp -
src/Fragmentation/Summation/unittests/Makefile.am
r4c9101 ra91710 34 34 35 35 FRAGMENTATIONSUMMATIONLIBS = \ 36 libUnitTest.la \ 37 ../libMolecuilder.la \ 36 38 ../libMolecuilderFragmentationSummation.la \ 37 39 ${CodePatterns_LIBS} \ … … 39 41 40 42 41 IndexSetUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\43 IndexSetUnitTest_SOURCES = \ 42 44 ../Fragmentation/Summation/unittests/IndexSetUnitTest.cpp \ 43 45 ../Fragmentation/Summation/unittests/IndexSetUnitTest.hpp 44 46 IndexSetUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS} 45 47 46 IndexSetContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\48 IndexSetContainerUnitTest_SOURCES = \ 47 49 ../Fragmentation/Summation/unittests/IndexSetContainerUnitTest.cpp \ 48 50 ../Fragmentation/Summation/unittests/IndexSetContainerUnitTest.hpp … … 53 55 ${FRAGMENTATIONSUMMATIONLIBS} 54 56 55 OrthogonalSummationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\57 OrthogonalSummationUnitTest_SOURCES = \ 56 58 ../Fragmentation/Summation/unittests/OrthogonalSummationUnitTest.cpp \ 57 59 ../Fragmentation/Summation/unittests/OrthogonalSummationUnitTest.hpp \ … … 60 62 OrthogonalSummationUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS} 61 63 62 SetValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\64 SetValueUnitTest_SOURCES = \ 63 65 ../Fragmentation/Summation/unittests/SetValueUnitTest.cpp \ 64 66 ../Fragmentation/Summation/unittests/SetValueUnitTest.hpp \ … … 67 69 SetValueUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS} 68 70 69 SetValueMapUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\71 SetValueMapUnitTest_SOURCES = \ 70 72 ../Fragmentation/Summation/unittests/SetValueMapUnitTest.cpp \ 71 73 ../Fragmentation/Summation/unittests/SetValueMapUnitTest.hpp 72 74 SetValueMapUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS} 73 75 74 SubsetMapUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\76 SubsetMapUnitTest_SOURCES = \ 75 77 ../Fragmentation/Summation/unittests/SubsetMapUnitTest.cpp \ 76 78 ../Fragmentation/Summation/unittests/SubsetMapUnitTest.hpp 77 79 SubsetMapUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS} 78 80 79 SummationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\81 SummationUnitTest_SOURCES = \ 80 82 ../Fragmentation/Summation/unittests/SummationUnitTest.cpp \ 81 83 ../Fragmentation/Summation/unittests/SummationUnitTest.hpp \ -
src/Fragmentation/unittests/Makefile.am
r4c9101 ra91710 19 19 20 20 FRAGMENTATIONLIBS = \ 21 libUnitTest.la \ 22 ../libMolecuilder.la \ 21 23 ../libMolecuilderFragmentation.la \ 22 24 ../libMolecuilderFragmentation_KeysetsContainer.la \ … … 26 28 27 29 28 KeySetsContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\30 KeySetsContainerUnitTest_SOURCES = \ 29 31 ../Fragmentation/unittests/KeySetsContainerUnitTest.cpp \ 30 32 ../Fragmentation/unittests/KeySetsContainerUnitTest.hpp 31 33 KeySetsContainerUnitTest_LDADD = ${FRAGMENTATIONLIBS} 32 34 33 MatrixContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp\35 MatrixContainerUnitTest_SOURCES = \ 34 36 ../Fragmentation/unittests/MatrixContainerUnitTest.cpp \ 35 37 ../Fragmentation/unittests/MatrixContainerUnitTest.hpp
Note:
See TracChangeset
for help on using the changeset viewer.
