Changeset eb0d77 for src/UIElements

Timestamp:

Sep 26, 2012, 5:24:47 PM (13 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:

94d5ac6

Parents:

b1b413

git-author:

Frederik Heber <heber@…> (07/13/12 08:57:55)

git-committer:

Frederik Heber <heber@…> (09/26/12 17:24:47)

Message:

FIX: Shared library libMolecuilderJobs needs to be given explicitly where brought in dependently.

• in my eyes, this is a libtool bug (see #1002565 on ubuntu's launchpad) as libtool should pull in shared libraries that are list as dependencies in given shared libraries (and also known to libtool according to the .la file). However, libtool.m4 has a switch find_all_dep_libs which is set to no for linux systems. Activating it causes the correct linking behavior but faults later because shared libraries are not found (i.e. some rpath problem).
• Hence, libMolecuilderJobs.la is given as dependency everywhere where also libMolecuilderUI is listed (also for all unit tests).

Location:

src/UIElements

Files:

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

src/UIElements/CommandLineUI/unittests/Makefile.am

@@ -24 +24 @@
   ../libMolecuilder.la \
   ../libMolecuilderParser.la \
-  ../libMolecuilderShapes.la \
+  ../libMolecuilderShapes.la
+if CONDJOBMARKET
+CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD += \
+        ../libMolecuilderJobs.la
+endif
+CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD += \
   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
   ../libMolecuilderRandomNumbers.la \

src/UIElements/Makefile.am

@@ -225 +225 @@
 libMolecuilderUI_la_LIBADD =
 
-if CONDJOBMARKET
-libMolecuilderUI_la_LIBADD += \
-        libMolecuilderJobs.la \
-        ${JobMarket_Controller_LIBS}
-endif
 libMolecuilderUI_la_LIBADD += \
         libMolecuilderActionPrototypes.la \
@@ -246 +241 @@
         libMolecuilderElement.la \
         libMolecuilderRandomNumbers.la
+if CONDJOBMARKET
+libMolecuilderUI_la_LIBADD += \
+        libMolecuilderJobs.la \
+        ${JobMarket_Controller_LIBS}
+endif
 libMolecuilderUI_la_LIBADD += \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \

src/UIElements/Menu/unittests/Makefile.am

@@ -39 +39 @@
   ../libMolecuilder.la \
   ../libMolecuilderParser.la \
-  ../libMolecuilderShapes.la \
+  ../libMolecuilderShapes.la
+if CONDJOBMARKET
+MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD += \
+        ../libMolecuilderJobs.la
+endif
+MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD += \
   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
   ../libMolecuilderRandomNumbers.la \