Changeset a91710 for src/Potentials

Timestamp:

Aug 21, 2014, 6:59:33 AM (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, Candidate_v1.7.0, 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.

Message:

Merge branch 'Fixes_Ubuntu14_04' into stable

Location:

src/Potentials

Files:

• Specifics/unittests/Makefile.am (modified) (2 diffs)
• unittests/Makefile.am (modified) (4 diffs)

src/Potentials/Specifics/unittests/Makefile.am

@@ -37 +37 @@
 
 POTENTIALSSPECIFICSLIBS = \
+        libUnitTest.la \
+        ../libMolecuilder.la \
         ../libMolecuilderPotentials.la \
         ../libMolecuilderFragmentation.la \
@@ -48 +50 @@
         $(BOOST_LIB)
 
-ConstantPotentialUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ConstantPotentialUnitTest_SOURCES = \
         ../Potentials/Specifics/unittests/ConstantPotentialUnitTest.cpp \
         ../Potentials/Specifics/unittests/ConstantPotentialUnitTest.hpp
 ConstantPotentialUnitTest_LDADD = ${POTENTIALSSPECIFICSLIBS}
 
-FourBodyPotential_ImproperUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+FourBodyPotential_ImproperUnitTest_SOURCES = \
         ../Potentials/Specifics/unittests/FourBodyPotential_ImproperUnitTest.cpp \
         ../Potentials/Specifics/unittests/FourBodyPotential_ImproperUnitTest.hpp
 FourBodyPotential_ImproperUnitTest_LDADD = ${POTENTIALSSPECIFICSLIBS}
 
-FourBodyPotential_TorsionUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+FourBodyPotential_TorsionUnitTest_SOURCES = \
         ../Potentials/Specifics/unittests/FourBodyPotential_TorsionUnitTest.cpp \
         ../Potentials/Specifics/unittests/FourBodyPotential_TorsionUnitTest.hpp
 FourBodyPotential_TorsionUnitTest_LDADD = ${POTENTIALSSPECIFICSLIBS}
 
-ManyBodyPotential_TersoffUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ManyBodyPotential_TersoffUnitTest_SOURCES = \
         ../Potentials/Specifics/unittests/ManyBodyPotential_TersoffUnitTest.cpp \
         ../Potentials/Specifics/unittests/ManyBodyPotential_TersoffUnitTest.hpp
 ManyBodyPotential_TersoffUnitTest_LDADD = ${POTENTIALSSPECIFICSLIBS}
 
-PairPotential_HarmonicUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+PairPotential_HarmonicUnitTest_SOURCES = \
         ../Potentials/Specifics/unittests/PairPotential_HarmonicUnitTest.cpp \
         ../Potentials/Specifics/unittests/PairPotential_HarmonicUnitTest.hpp
 PairPotential_HarmonicUnitTest_LDADD = ${POTENTIALSSPECIFICSLIBS}
 
-PairPotential_LennardJonesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+PairPotential_LennardJonesUnitTest_SOURCES = \
         ../Potentials/Specifics/unittests/PairPotential_LennardJonesUnitTest.cpp \
         ../Potentials/Specifics/unittests/PairPotential_LennardJonesUnitTest.hpp
 PairPotential_LennardJonesUnitTest_LDADD = ${POTENTIALSSPECIFICSLIBS}
 
-PairPotential_MorseUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+PairPotential_MorseUnitTest_SOURCES = \
         ../Potentials/Specifics/unittests/PairPotential_MorseUnitTest.cpp \
         ../Potentials/Specifics/unittests/PairPotential_MorseUnitTest.hpp
 PairPotential_MorseUnitTest_LDADD = ${POTENTIALSSPECIFICSLIBS}
 
-ThreeBodyPotential_AngleUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ThreeBodyPotential_AngleUnitTest_SOURCES = \
         ../Potentials/Specifics/unittests/ThreeBodyPotential_AngleUnitTest.cpp \
         ../Potentials/Specifics/unittests/ThreeBodyPotential_AngleUnitTest.hpp

src/Potentials/unittests/Makefile.am

@@ -22 +22 @@
 
 POTENTIALSLIBS = \
+        libUnitTest.la \
+        ../libMolecuilder.la \
         ../libMolecuilderPotentials.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
@@ -28 +30 @@
         $(BOOST_LIB)
 
-CompoundPotentialUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+CompoundPotentialUnitTest_SOURCES = \
         ../Potentials/unittests/CompoundPotentialUnitTest.cpp \
         ../Potentials/unittests/CompoundPotentialUnitTest.hpp
 CompoundPotentialUnitTest_LDADD = \
+        libUnitTest.la \
         ../libMolecuilderPotentials.la \
         ../libMolecuilderFragmentation.la \
@@ -43 +46 @@
         $(BOOST_LIB)
 
-PartialNucleiChargeFitterUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+PartialNucleiChargeFitterUnitTest_SOURCES = \
         ../Potentials/unittests/PartialNucleiChargeFitterUnitTest.cpp \
         ../Potentials/unittests/PartialNucleiChargeFitterUnitTest.hpp
@@ -50 +53 @@
         ${POTENTIALSLIBS}
 
-SerializablePotentialUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+SerializablePotentialUnitTest_SOURCES = \
         ../Potentials/unittests/SerializablePotentialUnitTest.cpp \
         ../Potentials/unittests/SerializablePotentialUnitTest.hpp \