Changeset a91710 for src/Shapes

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/Shapes

Files:

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

src/Shapes/Makefile.am

@@ -21 +21 @@
 lib_LTLIBRARIES += libMolecuilderShapes.la
 libMolecuilderShapes_la_includedir = $(includedir)/MoleCuilder/
+libMolecuilderShapes_la_LIBADD = \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS}
 nobase_libMolecuilderShapes_la_include_HEADERS = ${SHAPEHEADER}
 

src/Shapes/unittests/Makefile.am

@@ -29 +29 @@
 
 SHAPELIBS = \
-        ../libMolecuilderShapes.la \
+        libUnitTest.la \
+        ../libMolecuilder.la \
+        ../libMolecuilderUI.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS}
 #       $(BOOST_LIB)
 
-BaseShapesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+BaseShapesUnitTest_SOURCES = \
         ../Shapes/unittests/BaseShapesUnitTest.cpp \
         ../Shapes/unittests/BaseShapesUnitTest.hpp \
         ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
         ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
-nodist_BaseShapesUnitTest_SOURCES = \
-        ../Helpers/defs.hpp \
-        ../Helpers/defs.cpp
-BaseShapesUnitTest_LDADD = $(SHAPELIBS)
+BaseShapesUnitTest_LDADD = \
+        ../libMolecuilderShapes.la \
+        $(SHAPELIBS)
 
-ShapeFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ShapeFactoryUnitTest_SOURCES = \
         ../Shapes/unittests/ShapeFactoryUnitTest.cpp \
         ../Shapes/unittests/ShapeFactoryUnitTest.hpp \
@@ -51 +52 @@
         ../Shapes/unittests/stubs/moleculeStub.cpp \
         ../Shapes/unittests/stubs/WorldSelectedMoleculesStub.cpp
-nodist_ShapeFactoryUnitTest_SOURCES = \
-        ../Helpers/defs.hpp \
-        ../Helpers/defs.cpp \
-        ../Shapes/ShapeFactory.cpp \
-        ../Shapes/ShapeFactory.hpp
 ShapeFactoryUnitTest_LDADD = \
-        ../libMolecuilderElement.la \
+        ../libMolecuilderShapes.la \
         $(SHAPELIBS)
 
-ShapeOpsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ShapeOpsUnitTest_SOURCES = \
         ../Shapes/unittests/ShapeOpsUnitTest.cpp \
         ../Shapes/unittests/ShapeOpsUnitTest.hpp \
         ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
         ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
-nodist_ShapeOpsUnitTest_SOURCES = \
-        ../Helpers/defs.hpp \
-        ../Helpers/defs.cpp
-ShapeOpsUnitTest_LDADD = $(SHAPELIBS)
+ShapeOpsUnitTest_LDADD = \
+        ../libMolecuilderShapes.la \
+        $(SHAPELIBS)
 
-ShapeRegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ShapeRegistryUnitTest_SOURCES = \
         ../Shapes/unittests/ShapeRegistryUnitTest.cpp \
         ../Shapes/unittests/ShapeRegistryUnitTest.hpp \
         ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
         ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
-nodist_ShapeRegistryUnitTest_SOURCES = \
-        ../Helpers/defs.hpp \
-        ../Helpers/defs.cpp
-ShapeRegistryUnitTest_LDADD = $(SHAPELIBS)
+ShapeRegistryUnitTest_LDADD = \
+        ../libMolecuilderShapes.la \
+        $(SHAPELIBS)
 
-Shape_HomogeneousPointsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+Shape_HomogeneousPointsUnitTest_SOURCES = \
         ../Shapes/unittests/Shape_HomogeneousPointsUnitTest.cpp \
         ../Shapes/unittests/Shape_HomogeneousPointsUnitTest.hpp \
         ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
         ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
-nodist_Shape_HomogeneousPointsUnitTest_SOURCES = \
-        ../Helpers/defs.hpp \
-        ../Helpers/defs.cpp
-Shape_HomogeneousPointsUnitTest_LDADD = $(SHAPELIBS)
+Shape_HomogeneousPointsUnitTest_LDADD = \
+        ../libMolecuilderShapes.la \
+        $(SHAPELIBS)