Changeset a91710 for src/LinkedCell


Ignore:
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, 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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/LinkedCell/unittests/Makefile.am

    r4c9101 ra91710  
    2929
    3030LINKEDCELLLIBS = \
     31        libUnitTest.la \
     32        ../libMolecuilder.la \
    3133        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3234        ${CodePatterns_LIBS} \
    3335        $(BOOST_LIB)
    3436
    35 linkedcellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     37linkedcellUnitTest_SOURCES = \
    3638        ../LinkedCell/unittests/linkedcellUnitTest.cpp \
    3739        ../LinkedCell/unittests/linkedcellUnitTest.hpp
    … …  
    4648        $(LINKEDCELLLIBS)
    4749
    48 LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     50LinkedCellUnitTest_SOURCES = \
    4951        ../LinkedCell/unittests/LinkedCellUnitTest.cpp \
    5052        ../LinkedCell/unittests/LinkedCellUnitTest.hpp \
    … …  
    5456        $(LINKEDCELLLIBS)
    5557
    56 LinkedCell_ControllerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     58LinkedCell_ControllerUnitTest_SOURCES = \
    5759        ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.cpp \
    5860        ../LinkedCell/unittests/LinkedCell_ControllerUnitTest.hpp \
    … …  
    6466        ../LinkedCell/unittests/stubs/WorldTimeStub.cpp \
    6567        stubs/WorldStub.cpp \
    66         ../LinkedCell/PointCloudAdaptor.hpp \
    67         ../Box_BoundaryConditions.cpp \
    68         ../Box_BoundaryConditions.hpp
     68        ../LinkedCell/PointCloudAdaptor.hpp
    6969LinkedCell_ControllerUnitTest_LDADD = \
    70         ../libMolecuilderLinkedCell.la \
     70        ../libMolecuilderUI.la \
     71        ../libMolecuilder.la
     72if CONDJOBMARKET
     73LinkedCell_ControllerUnitTest_LDADD += \
     74        ../libMolecuilderJobs.la
     75endif
     76LinkedCell_ControllerUnitTest_LDADD += \
    7177        $(LINKEDCELLLIBS)
    7278
    73 LinkedCell_ModelUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     79LinkedCell_ModelUnitTest_SOURCES = \
    7480        ../LinkedCell/unittests/LinkedCell_ModelUnitTest.cpp \
    7581        ../LinkedCell/unittests/LinkedCell_ModelUnitTest.hpp \
    … …  
    8591        $(LINKEDCELLLIBS)
    8692
    87 LinkedCell_ViewUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     93LinkedCell_ViewUnitTest_SOURCES = \
    8894        ../LinkedCell/unittests/LinkedCell_ViewUnitTest.cpp \
    8995        ../LinkedCell/unittests/LinkedCell_ViewUnitTest.hpp \
Note: See TracChangeset for help on using the changeset viewer.