Changeset e920061 for src/Fragmentation/Summation/unittests

Timestamp:

Nov 8, 2012, 1:13:50 PM (12 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:

a2215d

Parents:

40698b

git-author:

Frederik Heber <heber@…> (07/26/12 12:28:22)

git-committer:

Frederik Heber <heber@…> (11/08/12 13:13:50)

Message:

libMolecuilderFagmentationSummation is now just a normal convenience library.

• We might keep it as a shared as it is independent of others. However, as libtool is buggy with pulling in shared library dependencies, we would have to add them also to the executables LDADD.
• also we removed the extra compilation SUBDIRS.
• adapted all paths in Makefile.am and unittests/Makefile.am.

File:

• src/Fragmentation/Summation/unittests/Makefile.am (modified) (3 diffs)

src/Fragmentation/Summation/unittests/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/src/Fragmenation -I$(top_srcdir)/src/Fragmenation/Summation
-
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
-
 FRAGMENTATIONSUMMATIONTESTSSOURCES = \
-        ../Fragmentation/unittests/IndexSetUnitTest.cpp \
-        ../Fragmentation/unittests/IndexSetContainerUnitTest.cpp \
-        ../Fragmentation/unittests/OrthogonalSummationUnitTest.cpp \
-        ../Fragmentation/unittests/SetValueUnitTest.cpp \
-        ../Fragmentation/unittests/SetValueMapUnitTest.cpp \
-        ../Fragmentation/unittests/SubsetMapUnitTest.cpp
+        ../Fragmentation/Summation/unittests/IndexSetUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/IndexSetContainerUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/OrthogonalSummationUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/SetValueUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/SetValueMapUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/SubsetMapUnitTest.cpp
 
 FRAGMENTATIONSUMMATIONTESTSHEADERS = \
-        ../Fragmentation/unittests/IndexSetUnitTest.hpp \
-        ../Fragmentation/unittests/IndexSetContainerUnitTest.cpp \
-        ../Fragmentation/unittests/OrthogonalSummationUnitTest.hpp \
-        ../Fragmentation/unittests/SetValueUnitTest.hpp \
-        ../Fragmentation/unittests/SetValueMapUnitTest.hpp \
-        ../Fragmentation/unittests/SubsetMapUnitTest.hpp
+        ../Fragmentation/Summation/unittests/IndexSetUnitTest.hpp \
+        ../Fragmentation/Summation/unittests/IndexSetContainerUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/OrthogonalSummationUnitTest.hpp \
+        ../Fragmentation/Summation/unittests/SetValueUnitTest.hpp \
+        ../Fragmentation/Summation/unittests/SetValueMapUnitTest.hpp \
+        ../Fragmentation/Summation/unittests/SubsetMapUnitTest.hpp
 
 FRAGMENTATIONSUMMATIONTESTS = \
@@ -36 +31 @@
 
 FRAGMENTATIONSUMMATIONLIBS = \
-        libMolecuilderFragmentationSummation.la \
+        ../libMolecuilderFragmentationSummation.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
@@ -42 +37 @@
 
 IndexSetUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        unittests/IndexSetUnitTest.cpp \
-        unittests/IndexSetUnitTest.hpp
+        ../Fragmentation/Summation/unittests/IndexSetUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/IndexSetUnitTest.hpp
 IndexSetUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
 
 IndexSetContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        unittests/IndexSetContainerUnitTest.cpp \
-        unittests/IndexSetContainerUnitTest.hpp \
-        IndexSet.cpp \
-        IndexSet.hpp \
-        IndexSetContainer.hpp \
-        SortedVector.hpp
+        ../Fragmentation/Summation/unittests/IndexSetContainerUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/IndexSetContainerUnitTest.hpp
 IndexSetContainerUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
 
 OrthogonalSummationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        unittests/OrthogonalSummationUnitTest.cpp \
-        unittests/OrthogonalSummationUnitTest.hpp \
-        OrthogonalSummation.hpp \
-        OrthogonalSummation_impl.hpp \
-        IndexSet.cpp \
-        IndexSet.hpp \
-        IndexSetContainer.hpp \
-        SortedVector.hpp \
-        SubsetMap.cpp \
-        SubsetMap.hpp
+        ../Fragmentation/Summation/unittests/OrthogonalSummationUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/OrthogonalSummationUnitTest.hpp
 OrthogonalSummationUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
 
 SetValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        unittests/SetValueUnitTest.cpp \
-        unittests/SetValueUnitTest.hpp \
-        unittests/stubs/SetValueMap_Mock.hpp \
-        unittests/stubs/SubsetMap_Mock.hpp \
-        IndexSet.cpp \
-        IndexSet.hpp \
-        IndexSetContainer.hpp \
-        SetValue.hpp
+        ../Fragmentation/Summation/unittests/SetValueUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/SetValueUnitTest.hpp \
+        ../Fragmentation/Summation/unittests/stubs/SetValueMap_Mock.hpp \
+        ../Fragmentation/Summation/unittests/stubs/SubsetMap_Mock.hpp
 SetValueUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
 
 SetValueMapUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        unittests/SetValueMapUnitTest.cpp \
-        unittests/SetValueMapUnitTest.hpp \
-        IndexSet.cpp \
-        IndexSet.hpp \
-        SetValue.hpp \
-        SetValueMap.hpp
+        ../Fragmentation/Summation/unittests/SetValueMapUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/SetValueMapUnitTest.hpp
 SetValueMapUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
 
 SubsetMapUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        unittests/SubsetMapUnitTest.cpp \
-        unittests/SubsetMapUnitTest.hpp \
-        IndexSet.cpp \
-        IndexSet.hpp \
-        IndexSetContainer.hpp \
-        SortedVector.hpp \
-        SubsetMap.cpp \
-        SubsetMap.hpp
-        SubsetMapUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}
+        ../Fragmentation/Summation/unittests/SubsetMapUnitTest.cpp \
+        ../Fragmentation/Summation/unittests/SubsetMapUnitTest.hpp
+SubsetMapUnitTest_LDADD = ${FRAGMENTATIONSUMMATIONLIBS}