Changeset a91710 for src/Parser

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, 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.

Message:

Merge branch 'Fixes_Ubuntu14_04' into stable

Location:

src/Parser

Files:

• Parameters/unittests/Makefile.am (modified) (2 diffs)
• unittests/Makefile.am (modified) (2 diffs)

src/Parser/Parameters/unittests/Makefile.am

@@ -20 +20 @@
 
 PARSERPARAMETERSLIBS = \
+        libUnitTest.la \
+        ../libMolecuilder.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
@@ -25 +27 @@
 
 
-ParameterStorageUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParameterStorageUnitTest_SOURCES = \
         ../Parser/Parameters/unittests/ParameterStorageUnitTest.cpp \
-        ../Parser/Parameters/unittests/ParameterStorageUnitTest.hpp \
-        ../Parser/Parameters/ParameterStorage.cpp \
-        ../Parser/Parameters/ParameterStorage.hpp \
-        ../Parameters/Parameter.hpp \
-        ../Parameters/Validators/DummyValidator.hpp \
-        ../Parameters/Validators/RangeValidator.hpp \
-        ../Parameters/Validators/RangeValidator_impl.hpp \
-        ../Parameters/Validators/Validator.hpp \
-        ../Parameters/Value.hpp \
-        ../Parameters/Value_impl.hpp \
-        ../Parameters/ValueInterface.hpp
+        ../Parser/Parameters/unittests/ParameterStorageUnitTest.hpp
 ParameterStorageUnitTest_LDADD = \
-        $(PARSERPARAMETERSLIBS)
+        ../libMolecuilderParser.la \
+        $(PARSERPARAMETERSLIBS) 
 
-StringParameterUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+StringParameterUnitTest_SOURCES = \
         ../Parser/Parameters/unittests/StringParameterUnitTest.cpp \
-        ../Parser/Parameters/unittests/StringParameterUnitTest.hpp \
-        ../Parameters/StreamOperators.hpp \
-        ../Parameters/Validators/DiscreteValidator.hpp \
-        ../Parameters/Validators/DiscreteValidator_impl.hpp \
-        ../Parameters/Validators/DummyValidator.hpp \
-        ../Parameters/Validators/RangeValidator.hpp \
-        ../Parameters/Validators/RangeValidator_impl.hpp \
-        ../Parameters/Validators/Validator.hpp \
-        ../Parameters/Value.hpp \
-        ../Parameters/Value_impl.hpp \
-        ../Parameters/Value_string.hpp \
-        ../Parameters/ValueInterface.hpp
+        ../Parser/Parameters/unittests/StringParameterUnitTest.hpp
 StringParameterUnitTest_LDADD = \
         ../libMolecuilderParameters.la \

src/Parser/unittests/Makefile.am

@@ -39 +39 @@
 
 PARSERLIBS = \
+        libUnitTest.la \
+        ../libMolecuilder.la \
         ../libMolecuilderUI.la
 if CONDJOBMARKET
@@ -50 +52 @@
 
 
-ParserMpqcUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParserMpqcUnitTest_SOURCES = \
         ../Parser/unittests/ParserMpqcUnitTest.cpp \
         ../Parser/unittests/ParserMpqcUnitTest.hpp
 ParserMpqcUnitTest_LDADD = ${PARSERLIBS}
 
-ParserPcpUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParserPcpUnitTest_SOURCES = \
         ../Parser/unittests/ParserPcpUnitTest.cpp \
         ../Parser/unittests/ParserPcpUnitTest.hpp
 ParserPcpUnitTest_LDADD = ${PARSERLIBS}
 
-ParserPdbUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParserPdbUnitTest_SOURCES = \
         ../Parser/unittests/ParserPdbUnitTest.cpp \
         ../Parser/unittests/ParserPdbUnitTest.hpp
 ParserPdbUnitTest_LDADD = ${PARSERLIBS}
 
-ParserPsi3UnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParserPsi3UnitTest_SOURCES = \
         ../Parser/unittests/ParserPsi3UnitTest.cpp \
         ../Parser/unittests/ParserPsi3UnitTest.hpp
 ParserPsi3UnitTest_LDADD = ${PARSERLIBS}
 
-ParserTremoloUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParserTremoloUnitTest_SOURCES = \
         ../Parser/unittests/ParserTremoloUnitTest.cpp \
         ../Parser/unittests/ParserTremoloUnitTest.hpp
 ParserTremoloUnitTest_LDADD = ${PARSERLIBS}
 
-ParserTremolo_ElementKeysUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParserTremolo_ElementKeysUnitTest_SOURCES = \
         ../Parser/unittests/ParserTremolo_ElementKeysUnitTest.cpp \
         ../Parser/unittests/ParserTremolo_ElementKeysUnitTest.hpp
 ParserTremolo_ElementKeysUnitTest_LDADD = ${PARSERLIBS}
 
-ParserXmlUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParserXmlUnitTest_SOURCES = \
         ../Parser/unittests/ParserXmlUnitTest.cpp \
         ../Parser/unittests/ParserXmlUnitTest.hpp
 ParserXmlUnitTest_LDADD = ${PARSERLIBS}
 
-ParserXyzUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ParserXyzUnitTest_SOURCES = \
         ../Parser/unittests/ParserXyzUnitTest.cpp \
         ../Parser/unittests/ParserXyzUnitTest.hpp