Changeset 748fc7


Ignore:
Timestamp:
Aug 21, 2014, 6:43:46 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:
07ecc5
Parents:
d93b4b3
git-author:
Frederik Heber <heber@…> (08/19/14 11:17:27)
git-committer:
Frederik Heber <heber@…> (08/21/14 06:43:46)
Message:

libMolecuilder is now a shared library.

  • linking error Vector::IsZero(double) with molecuilder(gui), related to libMolecuilderShapes was the root cause for this change. Again, it was not deducible why this error occured:
  • probably (me tired of these obfuscated linker errors ...) faulted because libMolecuilder is convenience lib while libMolecuilderUI and ..QtUI are shared and deps did not get passed along properly (by libtool) (e.g. ldd showed libMolecuilderShapes prior to libLinearAlgebra, containing said function Vector::IsZero(double), but I cannot influence this ordering and it should not even matter (dynamic linking).)
  • some cleanup in builder_init.cpp (no more loading of BondGraph from file named "\n".
  • TESTFIX: libMolecuilder.so added to all unittests, required for e.g. World::purgeInstance() ... and sometimes added libMolecuilderUI.so because libMolecuilder pulled them in due to static entities ... sigh.
  • removed all src object files from unittest .._SOURCES. This caused distclean faults "thanks" to new subdir-objects (automake).
Location:
src
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2626ACTIONLIBS = \
    2727        libUnitTest.la \
     28        ../libMolecuilder.la \
    2829        ../libMolecuilderUI.la
    2930if CONDJOBMARKET

  • src/Atom/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2222ATOMTESTLIBS = \
    2323        libUnitTest.la \
     24        ../libMolecuilder.la \
    2425        ../libMolecuilderUI.la
    2526ATOMTESTLIBS += \

  • src/Descriptors/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2020DESCRIPTORLIBS = \
    2121        libUnitTest.la \
     22        ../libMolecuilder.la \
    2223        ../libMolecuilderUI.la
    2324if CONDJOBMARKET

  • src/Element/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2323ELEMENTLIBS = \
    2424        libUnitTest.la \
     25        ../libMolecuilder.la \
    2526        ../libMolecuilderElement.la \
    2627        ../libMolecuilderHelpers.la \

  • src/Filling/unittests/Makefile.am

    rd93b4b3 r748fc7  
    3535FILLINGLIBS = \
    3636        libUnitTest.la \
     37        ../libMolecuilder.la \
    3738        ../libMolecuilderFilling.la \
    38         ../libMolecuilderUI.la \
    39         ../libMolecuilder.la
     39        ../libMolecuilderShapes.la \
     40        ../libMolecuilderUI.la
    4041if CONDJOBMARKET
    4142FILLINGLIBS += \

  • src/Fragmentation/Exporters/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2323FRAGMENTATIONEXPORTERSLIBS = \
    2424        libUnitTest.la \
     25        ../libMolecuilder.la \
    2526        ../libMolecuilderFragmentation.la \
    2627        ${CodePatterns_LIBS} \

  • src/Fragmentation/Homology/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2626FRAGMENTATIONHOMOLOGYLIBS = \
    2727        libUnitTest.la \
     28        ../libMolecuilder.la \
    2829        ../libMolecuilderFragmentationSetValues.la \
    2930        ../libMolecuilderFragmentation.la \

  • src/Fragmentation/Summation/Containers/unittests/Makefile.am

    rd93b4b3 r748fc7  
    1818FRAGMENTATIONCONTAINERLIBS = \
    1919  libUnitTest.la \
     20  ../libMolecuilder.la \
    2021  ../libMolecuilderFragmentationSummation.la \
    2122  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

  • src/Fragmentation/Summation/SetValues/unittests/Makefile.am

    rd93b4b3 r748fc7  
    3232FRAGMENTATIONSETVALUESLIBS = \
    3333        libUnitTest.la \
     34        ../libMolecuilder.la \
    3435        ../libMolecuilderFragmentationSetValues.la \
    3536        ${CodePatterns_LIBS} \

  • src/Fragmentation/Summation/unittests/Makefile.am

    rd93b4b3 r748fc7  
    3535FRAGMENTATIONSUMMATIONLIBS = \
    3636        libUnitTest.la \
     37        ../libMolecuilder.la \
    3738        ../libMolecuilderFragmentationSummation.la \
    3839        ${CodePatterns_LIBS} \

  • src/Fragmentation/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2020FRAGMENTATIONLIBS = \
    2121        libUnitTest.la \
     22        ../libMolecuilder.la \
    2223        ../libMolecuilderFragmentation.la \
    2324        ../libMolecuilderFragmentation_KeysetsContainer.la \

  • src/FunctionApproximation/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2020FUNCTIONAPPROXIMATIONLIBS = \
    2121        libUnitTest.la \
     22        ../libMolecuilder.la \
    2223        ../libMolecuilderFunctionApproximation.la \
    2324        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \

  • src/Graph/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2121GRAPHLIBS = \
    2222        libUnitTest.la \
     23        ../libMolecuilder.la \
    2324        ../libMolecuilderUI.la \
    2425        ../libMolecuilderGraph.la

  • src/Jobs/unittests/Makefile.am

    rd93b4b3 r748fc7  
    1818JOBSLIBS = \
    1919        libUnitTest.la \
     20        ../libMolecuilder.la \
    2021        ../libMolecuilderJobs.la \
    2122        ../libMolecuilderFragmentationContainers.la \

  • src/LinkedCell/unittests/Makefile.am

    rd93b4b3 r748fc7  
    3030LINKEDCELLLIBS = \
    3131        libUnitTest.la \
     32        ../libMolecuilder.la \
    3233        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3334        ${CodePatterns_LIBS} \
    … …  
    6566        ../LinkedCell/unittests/stubs/WorldTimeStub.cpp \
    6667        stubs/WorldStub.cpp \
    67         ../LinkedCell/PointCloudAdaptor.hpp \
    68         ../Box_BoundaryConditions.cpp \
    69         ../Box_BoundaryConditions.hpp
     68        ../LinkedCell/PointCloudAdaptor.hpp
    7069LinkedCell_ControllerUnitTest_LDADD = \
    71         ../libMolecuilderLinkedCell.la \
     70        ../libMolecuilderUI.la \
     71        ../libMolecuilder.la
     72if CONDJOBMARKET
     73LinkedCell_ControllerUnitTest_LDADD += \
     74        ../libMolecuilderJobs.la
     75endif
     76LinkedCell_ControllerUnitTest_LDADD += \
    7277        $(LINKEDCELLLIBS)
    7378

  • src/Makefile.am

    rd93b4b3 r748fc7  
    1010EXTRA_DIST =
    1111
    12 include Actions/Makefile.am
    13 include Analysis/Makefile.am
    14 include Atom/Makefile.am
    15 include Element/Makefile.am
    16 include Filling/Makefile.am
    17 include Fragmentation/Makefile.am
    18 include Fragmentation/Automation/Makefile.am
    19 include Fragmentation/Summation/Containers/Makefile.am
    20 include Fragmentation/Summation/Converter/Makefile.am
    21 include Fragmentation/Summation/Makefile.am
    22 include Fragmentation/Summation/SetValues/Makefile.am
    23 include FunctionApproximation/Makefile.am
    24 include Graph/Makefile.am
     12# libMolecuilder.la requires the libraries listed below
     13
    2514include Helpers/Makefile.am
    26 include Jobs/Makefile.am
    27 
    28 if CONDPYTHON
    29 include Python/Makefile.am
    30 endif
    31 
    32 include LinkedCell/Makefile.am
    33 include Parameters/Makefile.am
    34 include Parser/Makefile.am
    35 include Potentials/Makefile.am
    36 include RandomNumbers/Makefile.am
    3715include Shapes/Makefile.am
    3816include Tesselation/Makefile.am
    39 include UIElements/Makefile.am
     17
     18# then comes the library itself
    4019
    4120AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS}
    … …  
    202181  WorldTime.hpp
    203182
    204 noinst_LTLIBRARIES += libMolecuilder.la
     183lib_LTLIBRARIES += libMolecuilder.la
    205184libMolecuilder_la_includedir = $(includedir)/MoleCuilder/
    206185libMolecuilder_la_LDFLAGS = \
    … …  
    212191        libMolecuilderTesselation.la \
    213192        libMolecuilderShapes.la \
     193        libMolecuilderHelpers.la \
    214194        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    215195        ${CodePatterns_LIBS} \
    … …  
    235215## library file (.so).  The library ABI version is defined in configure.ac, so
    236216## that all version information is kept in one place.
    237 #libMolecuilder_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     217libMolecuilder_la_LDFLAGS += -version-info $(MOLECUILDER_SO_VERSION)
    238218
    239219## The generated configuration header is installed in its own subdirectory of
    … …  
    258238pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    259239
     240# then we compile the remainder of all other libraries, especially
     241# libMolecuilderUI.la, which requires libMolecuilder.la on install
     242
     243include Actions/Makefile.am
     244include Analysis/Makefile.am
     245include Atom/Makefile.am
     246include Element/Makefile.am
     247include Filling/Makefile.am
     248include Fragmentation/Makefile.am
     249include Fragmentation/Automation/Makefile.am
     250include Fragmentation/Summation/Containers/Makefile.am
     251include Fragmentation/Summation/Converter/Makefile.am
     252include Fragmentation/Summation/Makefile.am
     253include Fragmentation/Summation/SetValues/Makefile.am
     254include FunctionApproximation/Makefile.am
     255include Graph/Makefile.am
     256include Jobs/Makefile.am
     257
     258if CONDPYTHON
     259include Python/Makefile.am
     260endif
     261
     262include LinkedCell/Makefile.am
     263include Parameters/Makefile.am
     264include Parser/Makefile.am
     265include Potentials/Makefile.am
     266include RandomNumbers/Makefile.am
     267include UIElements/Makefile.am
    260268
    261269bin_PROGRAMS += molecuilder
    … …  
    300308molecuilder_LDFLAGS = \
    301309        $(AM_LDFLAGS) \
     310        $(CodePatterns_LDFLAGS) \
    302311        $(BOOST_FILESYSTEM_LDFLAGS) \
    303312        $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
    … …  
    308317        builder.cpp \
    309318        builder_init.cpp \
    310         builder_init.hpp
     319        builder_init.hpp \
     320        Python/PythonScripting.hpp
    311321molecuilder_LDADD = \
     322        libMolecuilder.la \
    312323        libMolecuilderUI.la
    313324molecuilder_LDADD += \
    314         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    315325        ${CodePatterns_LIBS} \
    316326        $(BOOST_THREAD_LIBS) \
    … …  
    348358        $(BOOST_THREAD_LDFLAGS)
    349359molecuildergui_LDADD = \
     360        libMolecuilder.la \
    350361        libMolecuilderQtUI.la \
    351362        libMolecuilderUI.la
    352363molecuildergui_LDADD += \
    353         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    354364        ${CodePatterns_LIBS} \
    355365        $(BOOST_THREAD_LIBS) \

  • src/Parameters/Makefile.am

    rd93b4b3 r748fc7  
    3333        Parameters/Parameter_impl.hpp \
    3434        Parameters/ParameterInterface.hpp \
     35        Parameters/StreamOperators.hpp \
    3536        Parameters/Validators/DiscreteValidator.hpp \
    3637        Parameters/Validators/DiscreteValidator_impl.hpp \

  • src/Parameters/unittests/Makefile.am

    rd93b4b3 r748fc7  
    3030PARAMETERSLIBS = \
    3131        libUnitTest.la \
     32        ../libMolecuilder.la \
    3233        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3334        ${CodePatterns_LIBS} \

  • src/Parser/Parameters/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2121PARSERPARAMETERSLIBS = \
    2222        libUnitTest.la \
     23        ../libMolecuilder.la \
    2324        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2425        ${CodePatterns_LIBS} \
    … …  
    2829ParameterStorageUnitTest_SOURCES = \
    2930        ../Parser/Parameters/unittests/ParameterStorageUnitTest.cpp \
    30         ../Parser/Parameters/unittests/ParameterStorageUnitTest.hpp \
    31         ../Parser/Parameters/ParameterStorage.cpp \
    32         ../Parser/Parameters/ParameterStorage.hpp \
    33         ../Parameters/Parameter.hpp \
    34         ../Parameters/Validators/DummyValidator.hpp \
    35         ../Parameters/Validators/RangeValidator.hpp \
    36         ../Parameters/Validators/RangeValidator_impl.hpp \
    37         ../Parameters/Validators/Validator.hpp \
    38         ../Parameters/Value.hpp \
    39         ../Parameters/Value_impl.hpp \
    40         ../Parameters/ValueInterface.hpp
     31        ../Parser/Parameters/unittests/ParameterStorageUnitTest.hpp
    4132ParameterStorageUnitTest_LDADD = \
    42         $(PARSERPARAMETERSLIBS)
     33        ../libMolecuilderParser.la \
     34        $(PARSERPARAMETERSLIBS)
    4335
    4436StringParameterUnitTest_SOURCES = \
    4537        ../Parser/Parameters/unittests/StringParameterUnitTest.cpp \
    46         ../Parser/Parameters/unittests/StringParameterUnitTest.hpp \
    47         ../Parameters/StreamOperators.hpp \
    48         ../Parameters/Validators/DiscreteValidator.hpp \
    49         ../Parameters/Validators/DiscreteValidator_impl.hpp \
    50         ../Parameters/Validators/DummyValidator.hpp \
    51         ../Parameters/Validators/RangeValidator.hpp \
    52         ../Parameters/Validators/RangeValidator_impl.hpp \
    53         ../Parameters/Validators/Validator.hpp \
    54         ../Parameters/Value.hpp \
    55         ../Parameters/Value_impl.hpp \
    56         ../Parameters/Value_string.hpp \
    57         ../Parameters/ValueInterface.hpp
     38        ../Parser/Parameters/unittests/StringParameterUnitTest.hpp
    5839StringParameterUnitTest_LDADD = \
    5940        ../libMolecuilderParameters.la \

  • src/Parser/unittests/Makefile.am

    rd93b4b3 r748fc7  
    4040PARSERLIBS = \
    4141        libUnitTest.la \
     42        ../libMolecuilder.la \
    4243        ../libMolecuilderUI.la
    4344if CONDJOBMARKET

  • src/Potentials/Specifics/unittests/Makefile.am

    rd93b4b3 r748fc7  
    3838POTENTIALSSPECIFICSLIBS = \
    3939        libUnitTest.la \
     40        ../libMolecuilder.la \
    4041        ../libMolecuilderPotentials.la \
    4142        ../libMolecuilderFragmentation.la \

  • src/Potentials/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2323POTENTIALSLIBS = \
    2424        libUnitTest.la \
     25        ../libMolecuilder.la \
    2526        ../libMolecuilderPotentials.la \
    2627        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \

  • src/RandomNumbers/Makefile.am

    rd93b4b3 r748fc7  
    4040
    4141lib_LTLIBRARIES += libMolecuilderRandomNumbers.la
    42 libMolecuilderRandomNumbers_includedir = $(includedir)/MoleCuilder/
    43 nobase_libMolecuilderRandomNumbers_include_HEADERS = ${RANDOMHEADER} ${RANDOMDEFS}
     42libMolecuilderRandomNumbers_la_includedir = $(includedir)/MoleCuilder/
     43libMolecuilderRandomNumbers_la_LIBADD = \
     44        ${CodePatterns_LIBS}
     45nobase_libMolecuilderRandomNumbers_la_include_HEADERS = ${RANDOMHEADER} ${RANDOMDEFS}
    4446
    4547## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"

  • src/RandomNumbers/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2929RANDOMNUMBERLIBS = \
    3030        libUnitTest.la \
     31        ../libMolecuilder.la \
    3132        ../libMolecuilderRandomNumbers.la \
    3233        ${CodePatterns_LIBS} \

  • src/Shapes/Makefile.am

    rd93b4b3 r748fc7  
    2121lib_LTLIBRARIES += libMolecuilderShapes.la
    2222libMolecuilderShapes_la_includedir = $(includedir)/MoleCuilder/
     23libMolecuilderShapes_la_LIBADD = \
     24        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     25        ${CodePatterns_LIBS}
    2326nobase_libMolecuilderShapes_la_include_HEADERS = ${SHAPEHEADER}
    2427

  • src/Shapes/unittests/Makefile.am

    rd93b4b3 r748fc7  
    3030SHAPELIBS = \
    3131        libUnitTest.la \
    32         ../libMolecuilderShapes.la \
     32        ../libMolecuilder.la \
     33        ../libMolecuilderUI.la \
    3334        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3435        ${CodePatterns_LIBS}
    … …  
    4041        ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
    4142        ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
    42 nodist_BaseShapesUnitTest_SOURCES = \
    43         ../Helpers/defs.hpp \
    44         ../Helpers/defs.cpp
    45 BaseShapesUnitTest_LDADD = $(SHAPELIBS)
     43BaseShapesUnitTest_LDADD = \
     44        ../libMolecuilderShapes.la \
     45        $(SHAPELIBS)
    4646
    4747ShapeFactoryUnitTest_SOURCES = \
    … …  
    5252        ../Shapes/unittests/stubs/moleculeStub.cpp \
    5353        ../Shapes/unittests/stubs/WorldSelectedMoleculesStub.cpp
    54 nodist_ShapeFactoryUnitTest_SOURCES = \
    55         ../Helpers/defs.hpp \
    56         ../Helpers/defs.cpp \
    57         ../Shapes/ShapeFactory.cpp \
    58         ../Shapes/ShapeFactory.hpp
    5954ShapeFactoryUnitTest_LDADD = \
    60         ../libMolecuilderElement.la \
     55        ../libMolecuilderShapes.la \
    6156        $(SHAPELIBS)
    6257
    … …  
    6661        ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
    6762        ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
    68 nodist_ShapeOpsUnitTest_SOURCES = \
    69         ../Helpers/defs.hpp \
    70         ../Helpers/defs.cpp
    71 ShapeOpsUnitTest_LDADD = $(SHAPELIBS)
     63ShapeOpsUnitTest_LDADD = \
     64        ../libMolecuilderShapes.la \
     65        $(SHAPELIBS)
    7266
    7367ShapeRegistryUnitTest_SOURCES = \
    … …  
    7670        ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
    7771        ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
    78 nodist_ShapeRegistryUnitTest_SOURCES = \
    79         ../Helpers/defs.hpp \
    80         ../Helpers/defs.cpp
    81 ShapeRegistryUnitTest_LDADD = $(SHAPELIBS)
     72ShapeRegistryUnitTest_LDADD = \
     73        ../libMolecuilderShapes.la \
     74        $(SHAPELIBS)
    8275
    8376Shape_HomogeneousPointsUnitTest_SOURCES = \
    … …  
    8679        ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
    8780        ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
    88 nodist_Shape_HomogeneousPointsUnitTest_SOURCES = \
    89         ../Helpers/defs.hpp \
    90         ../Helpers/defs.cpp
    91 Shape_HomogeneousPointsUnitTest_LDADD = $(SHAPELIBS)
     81Shape_HomogeneousPointsUnitTest_LDADD = \
     82        ../libMolecuilderShapes.la \
     83        $(SHAPELIBS)
    9284
    9385

  • src/Tesselation/unittests/Makefile.am

    rd93b4b3 r748fc7  
    2323TESSELATIONLIBS = \
    2424        libUnitTest.la \
     25        ../libMolecuilder.la \
    2526        ../libMolecuilderUI.la \
    2627        ../libMolecuilder.la

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

    rd93b4b3 r748fc7  
    2020CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD = \
    2121  libUnitTest.la \
     22  ../libMolecuilder.la \
    2223  ../libMolecuilderUI.la
    2324if CONDJOBMARKET

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

    rd93b4b3 r748fc7  
    2020MENULIBS = \
    2121  libUnitTest.la \
     22  ../libMolecuilder.la \
    2223  ../libMolecuilderUI.la
    2324if CONDJOBMARKET
    … …  
    3233MenuDescriptionUnitTest_SOURCES = \
    3334  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
    34   ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
    35   ../UIElements/Menu/MenuDescription.cpp \
    36   ../UIElements/Menu/MenuDescription.hpp
     35  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp
    3736MenuDescriptionUnitTest_CXXFLAGS = -I$(top_srcdir)/src/UIElements
    3837MenuDescriptionUnitTest_LDADD = $(MENULIBS)

  • src/builder_init.cpp

    rd93b4b3 r748fc7  
    5454#include "CodePatterns/Log.hpp"
    5555
    56 #include "Graph/BondGraph.hpp"
    57 
    58 #include "Parser/ChangeTracker.hpp"
    59 #include "Parser/FormatParserStorage.hpp"
     56//#include "Graph/BondGraph.hpp"
    6057
    6158#include "UIElements/UIFactory.hpp"
    … …  
    6966
    7067#include "version.h"
    71 
    72 #include "World.hpp"
    7368
    7469#include <boost/filesystem.hpp>
    … …  
    116111void initUI(int argc, char **argv)
    117112{
    118   std::string BondGraphFileName("\n");
     113  //std::string BondGraphFileName("\n");
    119114  // Parse command line options and if present create respective UI
    120115  // construct bond graph
    121   if (boost::filesystem::exists(BondGraphFileName)) {
    122     std::ifstream input(BondGraphFileName.c_str());
    123     if ((input.good()) && (World::getInstance().getBondGraph()->LoadBondLengthTable(input))) {
    124       LOG(0, "Bond length table loaded successfully.");
    125     } else {
    126       ELOG(1, "Bond length table loading failed.");
    127     }
    128     input.close();
    129   }
     116  //if (boost::filesystem::exists(BondGraphFileName)) {
     117  //  std::ifstream input(BondGraphFileName.c_str());
     118  //  if ((input.good()) && (World::getInstance().getBondGraph()->LoadBondLengthTable(input))) {
     119  //    LOG(0, "Bond length table loaded successfully.");
     120  //  } else {
     121  //    ELOG(1, "Bond length table loading failed.");
     122  //  }
     123  //  input.close();
     124  //}
    130125
    131126  // if we have python, autoexecute a molecuilder script in current folder

  • src/unittests/Makefile.am

    rd93b4b3 r748fc7  
    128128ALLLIBS = \
    129129        libUnitTest.la \
     130        ../libMolecuilder.la \
    130131        ../libMolecuilderUI.la
    131132if CONDJOBMARKET
    … …  
    199200        ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
    200201BoxUnitTest_LDADD = \
    201         libUnitTest.la \
    202         ../libMolecuilder.la \
    203         ../libMolecuilderShapes.la \
    204         ../libMolecuilderHelpers.la \
    205         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    206         ${CodePatterns_LIBS} \
    207         $(BOOST_LIB)
     202        $(ALLLIBS) \
     203        ../libMolecuilderShapes.la \
     204        ../libMolecuilderHelpers.la
    208205
    209206AtomIdSetUnitTest_SOURCES = \
    … …  
    214211Box_BoundaryConditionsTest_SOURCES = \
    215212        Box_BoundaryConditionsUnitTest.cpp \
    216         Box_BoundaryConditionsUnitTest.hpp \
    217         ../Box_BoundaryConditions.cpp \
    218         ../Box_BoundaryConditions.hpp
     213        Box_BoundaryConditionsUnitTest.hpp
    219214Box_BoundaryConditionsTest_LDADD = \
    220         libUnitTest.la \
    221         ${CodePatterns_LIBS} \
    222         $(BOOST_LIB)
     215        $(ALLLIBS) \
     216        ../libMolecuilderShapes.la \
     217        ../libMolecuilderHelpers.la
    223218
    224219FormulaUnittest_SOURCES = \
    … …  
    242237WorldTimeUnitTest_SOURCES = \
    243238        WorldTimeUnitTest.cpp \
    244         WorldTimeUnitTest.hpp \
    245         ../WorldTime.cpp \
    246         ../WorldTime.hpp
     239        WorldTimeUnitTest.hpp
    247240WorldTimeUnitTest_LDADD = \
    248         libUnitTest.la \
    249         ${BOOST_LIB}
     241        $(ALLLIBS) \
     242        ../libMolecuilderShapes.la \
     243        ../libMolecuilderHelpers.la
    250244
    251245
Note: See TracChangeset for help on using the changeset viewer.