Changeset a91710 for src/UIElements

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

Files:

• CommandLineUI/unittests/Makefile.am (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• Menu/unittests/Makefile.am (modified) (2 diffs)
• Views/Qt4/Plotting/Makefile.am (modified) (1 diff)

src/UIElements/CommandLineUI/unittests/Makefile.am

@@ -15 +15 @@
 noinst_PROGRAMS += $(UIELEMENTSCOMMANDLINEPARSERTESTS)
 
-CommandLineParser_ActionRegistry_ConsistencyUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+CommandLineParser_ActionRegistry_ConsistencyUnitTest_SOURCES = \
   ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp \
   ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.hpp
 CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD = \
+  libUnitTest.la \
+  ../libMolecuilder.la \
   ../libMolecuilderUI.la
 if CONDJOBMARKET

src/UIElements/Makefile.am

@@ -226 +226 @@
 lib_LTLIBRARIES += libMolecuilderUI.la
 libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 
+libMolecuilderUI_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 
 if CONDJOBMARKET
 libMolecuilderUI_la_CPPFLAGS += ${JobMarket_CFLAGS}
@@ -344 +344 @@
 
 libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
+libMolecuilderQtUI_la_CPPFLAGS = $(AM_CPPFLAGS) ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
 libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(mol_ac_qwt_ldflags)
 

src/UIElements/Menu/unittests/Makefile.am

@@ -19 +19 @@
 
 MENULIBS = \
+  libUnitTest.la \
+  ../libMolecuilder.la \
   ../libMolecuilderUI.la
 if CONDJOBMARKET
@@ -29 +31 @@
   $(BOOST_LIB)
 
-MenuDescriptionUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+MenuDescriptionUnitTest_SOURCES = \
   ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
-  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
-  ../UIElements/Menu/MenuDescription.cpp \
-  ../UIElements/Menu/MenuDescription.hpp
+  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp
 MenuDescriptionUnitTest_CXXFLAGS = -I$(top_srcdir)/src/UIElements
 MenuDescriptionUnitTest_LDADD = $(MENULIBS)
 
-MenuDescription_ActionRegistry_ConsistencyUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+MenuDescription_ActionRegistry_ConsistencyUnitTest_SOURCES = \
   ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp \
   ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp

src/UIElements/Views/Qt4/Plotting/Makefile.am

@@ -37 +37 @@
 
 libMolecuilderQwtUI_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderQwtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
+libMolecuilderQwtUI_la_CPPFLAGS = $(AM_CPPFLAGS) ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
 libMolecuilderQwtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(mol_ac_qwt_ldflags)