Changeset a91710 for src/Fragmentation/Summation/SetValues

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, 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/Fragmentation/Summation/SetValues

Files:

• Makefile.am (modified) (1 diff)
• unittests/Makefile.am (modified) (3 diffs)

src/Fragmentation/Summation/SetValues/Makefile.am

@@ -22 +22 @@
 noinst_LTLIBRARIES += libMolecuilderFragmentationSetValues.la
 libMolecuilderFragmentationSetValues_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderFragmentationSetValues_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderFragmentationSetValues_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 libMolecuilderFragmentationSetValues_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
 libMolecuilderFragmentationSetValues_la_LIBADD = \

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

@@ -31 +31 @@
 
 FRAGMENTATIONSETVALUESLIBS = \
+        libUnitTest.la \
+        ../libMolecuilder.la \
         ../libMolecuilderFragmentationSetValues.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
 
-EigenvaluesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+EigenvaluesUnitTest_SOURCES = \
         ../Fragmentation/Summation/SetValues/unittests/EigenvaluesUnitTest.cpp \
         ../Fragmentation/Summation/SetValues/unittests/EigenvaluesUnitTest.hpp
@@ -42 +44 @@
         $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
 
-FragmentUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+FragmentUnitTest_SOURCES = \
         ../Fragmentation/Summation/SetValues/unittests/FragmentUnitTest.cpp \
         ../Fragmentation/Summation/SetValues/unittests/FragmentUnitTest.hpp
@@ -49 +51 @@
         $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
 
-HistogramUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+HistogramUnitTest_SOURCES = \
         ../Fragmentation/Summation/SetValues/unittests/HistogramUnitTest.cpp \
         ../Fragmentation/Summation/SetValues/unittests/HistogramUnitTest.hpp
 HistogramUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
 
-IndexedVectorsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+IndexedVectorsUnitTest_SOURCES = \
         ../Fragmentation/Summation/SetValues/unittests/IndexedVectorsUnitTest.cpp \
         ../Fragmentation/Summation/SetValues/unittests/IndexedVectorsUnitTest.hpp
 IndexedVectorsUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
 
-SamplingGridPropertiesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+SamplingGridPropertiesUnitTest_SOURCES = \
         ../Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.cpp \
         ../Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.hpp
 SamplingGridPropertiesUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
 
-SamplingGridUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+SamplingGridUnitTest_SOURCES = \
         ../Fragmentation/Summation/SetValues/unittests/SamplingGridUnitTest.cpp \
         ../Fragmentation/Summation/SetValues/unittests/SamplingGridUnitTest.hpp