Ignore:
Timestamp:
Aug 6, 2010, 9:34:59 AM (14 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:
311d688
Parents:
b6da28 (diff), 255971 (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.
git-author:
Frederik Heber <heber@…> (08/06/10 09:24:26)
git-committer:
Frederik Heber <heber@…> (08/06/10 09:34:59)
Message:

Merge branch 'SharedLibraries' into stable

  • BUGFIX: MemDebug.cpp in case of no MEMDEBUG defined, iosfwd include was missing.

Conflicts:

src/Actions/AnalysisAction/PointCorrelationAction.hpp
src/Actions/Makefile.am
src/Makefile.am
src/UIElements/Makefile.am
src/unittests/Makefile.am
src/unittests/ShapeUnittest.cpp

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    rb6da28 rd223d5  
    4949noinst_PROGRAMS = $(TESTS) TestRunner
    5050
    51 GSLLIBS = ../libgslwrapper.a ../libmolecuilderbase.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
    52 ALLLIBS = ../libmolecuilder.a ${GSLLIBS}
    53 PARSERLIBS = ../libparser.a ${ALLLIBS}
    54 UILIBS = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions.a ${ALLLIBS} ${BOOST_PROGRAM_OPTIONS_LIB}
     51GSLLIBS = \
     52        ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
     53        ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
     54        ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
     55        $(BOOST_LIB) \
     56        ${BOOST_THREAD_LIB}
     57ALLLIBS = \
     58        ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
     59        ${PARSERLIBS} \
     60        ../libMolecuilder-@MOLECUILDER_API_VERSION@.la \
     61        ${GSLLIBS} \
     62        ${BOOST_PROGRAM_OPTIONS_LIB}
     63PARSERLIBS = ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
     64UILIBS = ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la 
    5565
    5666TESTSOURCES = \
    … …  
    119129  MoleculeDescriptorTest.hpp \
    120130  periodentafelTest.hpp \
     131  ParserUnitTest.hpp \
    121132  PlaneUnittest.hpp \
    122133  ObserverTest.hpp \
    … …  
    129140 
    130141
    131 ActionSequenceTest_SOURCES = UnitTestMain.cpp ActionSequenceTest.cpp ActionSequenceTest.hpp $(srcdir)/../version.c
    132 ActionSequenceTest_LDADD = ${UILIBS}
     142ActionSequenceTest_SOURCES = UnitTestMain.cpp ActionSequenceTest.cpp ActionSequenceTest.hpp
     143ActionSequenceTest_LDADD = ${UILIBS} ${ALLLIBS}
    133144
    134145ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    … …  
    169180
    170181GSLMatrixSymmetricUnitTest_SOURCES = UnitTestMain.cpp gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
    171 GSLMatrixSymmetricUnitTest_LDADD = ${GSLLIBS}
     182GSLMatrixSymmetricUnitTest_LDADD = ${ALLLIBS}
    172183
    173184GSLMatrixUnitTest_SOURCES = UnitTestMain.cpp gslmatrixunittest.cpp gslmatrixunittest.hpp
    174 GSLMatrixUnitTest_LDADD = ${GSLLIBS}
     185GSLMatrixUnitTest_LDADD = ${ALLLIBS}
    175186
    176187GSLVectorUnitTest_SOURCES = UnitTestMain.cpp gslvectorunittest.cpp gslvectorunittest.hpp
    177 GSLVectorUnitTest_LDADD = ${GSLLIBS}
     188GSLVectorUnitTest_LDADD = ${ALLLIBS}
    178189
    179190InfoUnitTest_SOURCES = UnitTestMain.cpp infounittest.cpp infounittest.hpp
    … …  
    195206LogUnitTest_LDADD = ${ALLLIBS}
    196207
    197 manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp $(srcdir)/../version.c
    198 manipulateAtomsTest_LDADD = ${UILIBS}
     208manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
     209manipulateAtomsTest_LDADD = ${UILIBS} ${ALLLIBS}
    199210
    200211MatrixUnittest_SOURCES = UnitTestMain.cpp MatrixUnittest.cpp MatrixUnittest.hpp
    … …  
    208219
    209220ParserUnitTest_SOURCES = UnitTestMain.cpp ParserUnitTest.cpp ParserUnitTest.hpp
    210 ParserUnitTest_LDADD = ${PARSERLIBS}
     221ParserUnitTest_LDADD = ${ALLLIBS}
    211222
    212223periodentafelTest_SOURCES = UnitTestMain.cpp periodentafelTest.cpp periodentafelTest.hpp
    … …  
    234245Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    235246
    236 TestRunner_SOURCES = TestRunnerMain.cpp $(srcdir)/../version.c $(TESTSOURCES) $(TESTHEADERS)
    237 TestRunner_LDADD = ../UIElements/libMolecuilderUI.a ../Actions/libMolecuilderActions.a ../libmolecuilder.a ../libparser.a ../libgslwrapper.a ../libmolecuilderbase.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
     247TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
     248TestRunner_LDADD = ${UILIBS} ${ALLLIBS}
    238249
    239250VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
Note: See TracChangeset for help on using the changeset viewer.