Changeset eb0d77 for src


Ignore:
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
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/unittests/Makefile.am

    rb1b413 reb0d77  
    2626ACTIONLIBS = \
    2727        ../libMolecuilderUI.la
     28if CONDJOBMARKET
     29ACTIONLIBS += \
     30        ../libMolecuilderJobs.la
     31endif
    2832
    2933# note that DummyUI inherits Dialog which depends on boost/file_system ...

  • src/Analysis/unittests/Makefile.am

    rb1b413 reb0d77  
    3030        ../libMolecuilderAnalysis.la \
    3131        ../libMolecuilderUI.la \
    32         ../libMolecuilder.la \
     32        ../libMolecuilder.la
     33if CONDJOBMARKET
     34ANALYSISLIBS += \
     35        ../libMolecuilderJobs.la
     36endif
     37ANALYSISLIBS += \
    3338        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3439        ${CodePatterns_LIBS} \

  • src/Atom/unittests/Makefile.am

    rb1b413 reb0d77  
    2525        ../libMolecuilderParser.la \
    2626        ../libMolecuilder.la \
    27         ../libMolecuilderShapes.la \
     27        ../libMolecuilderShapes.la
     28if CONDJOBMARKET
     29ATOMTESTLIBS += \
     30        ../libMolecuilderJobs.la
     31endif
     32ATOMTESTLIBS += \
    2833        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2934        ../libMolecuilderRandomNumbers.la \

  • src/Descriptors/unittests/Makefile.am

    rb1b413 reb0d77  
    2323        ../libMolecuilderParser.la \
    2424        ../libMolecuilder.la \
    25         ../libMolecuilderShapes.la \
     25        ../libMolecuilderShapes.la
     26if CONDJOBMARKET
     27DESCRIPTORLIBS += \
     28        ../libMolecuilderJobs.la
     29endif
     30DESCRIPTORLIBS += \
    2631        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2732        ../libMolecuilderRandomNumbers.la \

  • src/Filling/unittests/Makefile.am

    rb1b413 reb0d77  
    3333noinst_PROGRAMS += $(FILLINGTESTS)
    3434
    35 FILLINGLIBS =
     35FILLINGLIBS = \
     36        ../libMolecuilderFilling.la \
     37        ../libMolecuilderUI.la \
     38        ../libMolecuilder.la
     39if CONDJOBMARKET
     40FILLINGLIBS += \
     41        ../libMolecuilderJobs.la
     42endif
     43FILLINGLIBS += \
     44        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     45        ${CodePatterns_LIBS} \
     46        $(BOOST_LIBS)
    3647
    3748ClusterUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    3849        ../Filling/unittests/ClusterUnitTest.cpp \
    3950        ../Filling/unittests/ClusterUnitTest.hpp
    40 ClusterUnitTest_LDADD = \
    41         ../libMolecuilderFilling.la \
    42         ../libMolecuilderUI.la \
    43         ../libMolecuilder.la \
    44         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    45         ${CodePatterns_LIBS} \
    46         $(BOOST_LIBS)
     51ClusterUnitTest_LDADD = $(FILLINGLIBS)
    4752
    4853FillerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    4954        ../Filling/unittests/FillerUnitTest.cpp \
    5055        ../Filling/unittests/FillerUnitTest.hpp
    51 FillerUnitTest_LDADD = \
    52         ../libMolecuilderFilling.la \
    53         ../libMolecuilderUI.la \
    54         ../libMolecuilder.la \
    55         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    56         ${CodePatterns_LIBS} \
    57         $(BOOST_LIBS)
     56FillerUnitTest_LDADD = $(FILLINGLIBS)
    5857
    5958IsInsideDomain_FillPredicateUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    6059        ../Filling/unittests/IsInsideDomain_FillPredicateUnitTest.cpp \
    6160        ../Filling/unittests/IsInsideDomain_FillPredicateUnitTest.hpp
    62 IsInsideDomain_FillPredicateUnitTest_LDADD = \
    63         ../libMolecuilderFilling.la \
    64         ../libMolecuilderUI.la \
    65         ../libMolecuilder.la \
    66         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    67         ${CodePatterns_LIBS} \
    68         $(BOOST_LIBS)
     61IsInsideDomain_FillPredicateUnitTest_LDADD = $(FILLINGLIBS)
    6962
    7063IsInsideSurface_FillPredicateUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    7164        ../Filling/unittests/IsInsideSurface_FillPredicateUnitTest.cpp \
    7265        ../Filling/unittests/IsInsideSurface_FillPredicateUnitTest.hpp
    73 IsInsideSurface_FillPredicateUnitTest_LDADD = \
    74         ../libMolecuilderFilling.la \
    75         ../libMolecuilderUI.la \
    76         ../libMolecuilder.la \
    77         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    78         ${CodePatterns_LIBS} \
    79         $(BOOST_LIBS)
     66IsInsideSurface_FillPredicateUnitTest_LDADD = $(FILLINGLIBS)
    8067
    8168IsValidInDomain_FillPredicateUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    8269        ../Filling/unittests/IsValidInDomain_FillPredicateUnitTest.cpp \
    8370        ../Filling/unittests/IsValidInDomain_FillPredicateUnitTest.hpp
    84 IsValidInDomain_FillPredicateUnitTest_LDADD = \
    85         ../libMolecuilderFilling.la \
    86         ../libMolecuilderUI.la \
    87         ../libMolecuilder.la \
    88         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    89         ${CodePatterns_LIBS} \
    90         $(BOOST_LIBS)
     71IsValidInDomain_FillPredicateUnitTest_LDADD = $(FILLINGLIBS)
    9172
    9273IsVoidNode_FillPredicateUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    9374        ../Filling/unittests/IsVoidNode_FillPredicateUnitTest.cpp \
    9475        ../Filling/unittests/IsVoidNode_FillPredicateUnitTest.hpp
    95 IsVoidNode_FillPredicateUnitTest_LDADD = \
    96         ../libMolecuilderFilling.la \
    97         ../libMolecuilderUI.la \
    98         ../libMolecuilder.la \
    99         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    100         ${CodePatterns_LIBS} \
    101         $(BOOST_LIBS)
     76IsVoidNode_FillPredicateUnitTest_LDADD = $(FILLINGLIBS)
    10277
    10378Ops_FillPredicateUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    10479        ../Filling/unittests/Ops_FillPredicateUnitTest.cpp \
    10580        ../Filling/unittests/Ops_FillPredicateUnitTest.hpp
    106 Ops_FillPredicateUnitTest_LDADD = \
    107         ../libMolecuilderFilling.la \
    108         ../libMolecuilderUI.la \
    109         ../libMolecuilder.la \
    110         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    111         ${CodePatterns_LIBS} \
    112         $(BOOST_LIBS)
     81Ops_FillPredicateUnitTest_LDADD = $(FILLINGLIBS)
    11382
    11483

  • src/Graph/unittests/Makefile.am

    rb1b413 reb0d77  
    2121GRAPHLIBS = \
    2222        ../libMolecuilderUI.la \
    23         ../libMolecuilderGraph.la \
     23        ../libMolecuilderGraph.la
     24if CONDJOBMARKET
     25GRAPHLIBS += \
     26        ../libMolecuilderJobs.la
     27endif
     28GRAPHLIBS += \
    2429        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2530        ${CodePatterns_LIBS} \

  • src/LinkedCell/unittests/Makefile.am

    rb1b413 reb0d77  
    3838linkedcellUnitTest_LDADD = \
    3939        ../libMolecuilderUI.la \
    40         ../libMolecuilder.la \
     40        ../libMolecuilder.la
     41if CONDJOBMARKET
     42linkedcellUnitTest_LDADD += \
     43        ../libMolecuilderJobs.la
     44endif
     45linkedcellUnitTest_LDADD += \
    4146        $(LINKEDCELLLIBS)
    4247
    … …  
    7277LinkedCell_ModelUnitTest_LDADD = \
    7378        ../libMolecuilderUI.la \
    74         ../libMolecuilder.la \
     79        ../libMolecuilder.la
     80if CONDJOBMARKET
     81LinkedCell_ModelUnitTest_LDADD += \
     82        ../libMolecuilderJobs.la
     83endif
     84LinkedCell_ModelUnitTest_LDADD += \
    7585        $(LINKEDCELLLIBS)
    7686
    … …  
    8292LinkedCell_ViewUnitTest_LDADD = \
    8393        ../libMolecuilderUI.la \
    84         ../libMolecuilder.la \
     94        ../libMolecuilder.la
     95if CONDJOBMARKET
     96LinkedCell_ViewUnitTest_LDADD += \
     97        ../libMolecuilderJobs.la
     98endif
     99LinkedCell_ViewUnitTest_LDADD += \
    85100        $(LINKEDCELLLIBS)
    86101

  • src/Makefile.am

    rb1b413 reb0d77  
    288288pyMoleCuilder_la_LDFLAGS = -module -avoid-version -shared $(BOOST_PYTHON_LDFLAGS)
    289289pyMoleCuilder_la_LIBADD = \
    290         libMolecuilderUI.la \
     290        libMolecuilderUI.la
     291if CONDJOBMARKET
     292pyMoleCuilder_la_LIBADD += \
     293        libMolecuilderJobs.la
     294endif
     295pyMoleCuilder_la_LIBADD += \
    291296        $(BOOST_PYTHON_LIBS) \
    292297        ${CodePatterns_LIBS} \
    … …  
    305310        cleanUp.hpp
    306311molecuilder_LDADD = \
    307         libMolecuilderUI.la \
     312        libMolecuilderUI.la
     313if CONDJOBMARKET
     314molecuilder_LDADD += \
     315        libMolecuilderJobs.la
     316endif
     317molecuilder_LDADD += \
    308318        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    309319        ${CodePatterns_LIBS} \
    … …  
    327337molecuildergui_LDADD = \
    328338        libMolecuilderQtUI.la \
    329         libMolecuilderUI.la \
     339        libMolecuilderUI.la
     340if CONDJOBMARKET
     341molecuildergui_LDADD += \
     342        libMolecuilderJobs.la
     343endif
     344molecuildergui_LDADD += \
    330345        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    331346        ${CodePatterns_LIBS} \

  • src/Parser/unittests/Makefile.am

    rb1b413 reb0d77  
    3939
    4040PARSERLIBS = \
    41         ../libMolecuilderUI.la \
     41        ../libMolecuilderUI.la
     42if CONDJOBMARKET
     43PARSERLIBS += \
     44        ../libMolecuilderJobs.la
     45endif
     46PARSERLIBS += \
    4247        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4348        ${CodePatterns_LIBS}

  • src/Tesselation/unittests/Makefile.am

    rb1b413 reb0d77  
    2323TESSELATIONLIBS = \
    2424        ../libMolecuilderUI.la \
    25         ../libMolecuilder.la \
     25        ../libMolecuilder.la
     26if CONDJOBMARKET
     27TESSELATIONLIBS += \
     28        ../libMolecuilderJobs.la
     29endif
     30TESSELATIONLIBS += \
    2631        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2732        ${CodePatterns_LIBS} \

  • src/UIElements/CommandLineUI/unittests/Makefile.am

    rb1b413 reb0d77  
    2424  ../libMolecuilder.la \
    2525  ../libMolecuilderParser.la \
    26   ../libMolecuilderShapes.la \
     26  ../libMolecuilderShapes.la
     27if CONDJOBMARKET
     28CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD += \
     29        ../libMolecuilderJobs.la
     30endif
     31CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD += \
    2732  $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2833  ../libMolecuilderRandomNumbers.la \

  • src/UIElements/Makefile.am

    rb1b413 reb0d77  
    225225libMolecuilderUI_la_LIBADD =
    226226
    227 if CONDJOBMARKET
    228 libMolecuilderUI_la_LIBADD += \
    229         libMolecuilderJobs.la \
    230         ${JobMarket_Controller_LIBS}
    231 endif
    232227libMolecuilderUI_la_LIBADD += \
    233228        libMolecuilderActionPrototypes.la \
    … …  
    246241        libMolecuilderElement.la \
    247242        libMolecuilderRandomNumbers.la
     243if CONDJOBMARKET
     244libMolecuilderUI_la_LIBADD += \
     245        libMolecuilderJobs.la \
     246        ${JobMarket_Controller_LIBS}
     247endif
    248248libMolecuilderUI_la_LIBADD += \
    249249        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \

  • src/UIElements/Menu/unittests/Makefile.am

    rb1b413 reb0d77  
    3939  ../libMolecuilder.la \
    4040  ../libMolecuilderParser.la \
    41   ../libMolecuilderShapes.la \
     41  ../libMolecuilderShapes.la
     42if CONDJOBMARKET
     43MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD += \
     44        ../libMolecuilderJobs.la
     45endif
     46MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD += \
    4247  $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4348  ../libMolecuilderRandomNumbers.la \

  • src/unittests/Makefile.am

    rb1b413 reb0d77  
    7171        ../libMolecuilderFilling.la \
    7272        ../libMolecuilderUI.la \
    73         ../libMolecuilder.la \
     73        ../libMolecuilder.la
     74if CONDJOBMARKET
     75ALLLIBS += \
     76        ../libMolecuilderJobs.la
     77endif
     78ALLLIBS += \
    7479        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    7580        ${CodePatterns_LIBS} \
    … …  
    170175        MoleculeUnitTest.cpp \
    171176        MoleculeUnitTest.hpp
    172 MoleculeUnitTest_LDADD = \
    173         ../libMolecuilderUI.la \
    174         ../libMolecuilder.la \
    175         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la
     177MoleculeUnitTest_LDADD = $(ALLLIBS)
    176178
    177179WorldTimeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
Note: See TracChangeset for help on using the changeset viewer.