Changeset 290c8e


Ignore:
Timestamp:
Mar 2, 2017, 2:02:46 PM (8 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable
Children:
c3f795
Parents:
cb98f1
git-author:
Frederik Heber <heber@…> (02/19/17 19:29:46)
git-committer:
Frederik Heber <heber@…> (03/02/17 14:02:46)
Message:

Changed debian/rules and control for no longer required codepatterns, levmar.

  • also vmg is now enabled and we needed to modify CXX for mpi requirement, needed by vmg.
Location:
debian
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • debian/control

    rcb98f1 r290c8e  
    99 libboost-filesystem-dev (>=1.46), libboost-iostreams-dev (>=1.46),
    1010 libboost-python-dev (>=1.46), python (>=2.7), python-dev (>=2.7), libgsl0-dev,
    11  libcodepatterns (>=1.3.0), liblapack-dev (>= 3.3.1), levmar (>=2.6),
    12  units, libcppunit-dev (>=1.12), libqt4-dev (>=4.8.5), libqt4-3d-dev (>=1.0),
    13  libqwt5-qt4-dev (>=5.2.2), doxygen (>=1.7.6), graphviz (>= 2.26.3)
     11 liblapack-dev (>= 3.3.1), units, libcppunit-dev (>=1.12),
     12 libqt4-dev (>=4.8.5), libqt4-3d-dev (>=1.0), libqwt5-qt4-dev (>=5.2.2),
     13 doxygen (>=1.7.6), graphviz (>= 2.26.3)
    1414Build-Conflicts: autoconf2.13, automake1.4
    1515Standards-Version: 3.9.3

  • debian/rules

    rcb98f1 r290c8e  
    44include /usr/share/cdbs/1/class/autotools.mk
    55
    6 DEB_CONFIGURE_EXTRA_FLAGS += --disable-debug --disable-action-thread --disable-jobmarket --disable-vmg --enable-python --enable-qtgui --enable-qwt --enable-levmar
     6DEB_CONFIGURE_EXTRA_FLAGS += --disable-debug --disable-valgrind --enable-qtgui-capture-log --enable-action-thread --enable-jobmarket --enable-vmg --with-vmg-mpi --enable-python --enable-qtgui --enable-qwt --enable-levmar --with-default-parallel=none CXX='mpic++' CC='mpicc' F77='mpif77' --with-Qt-bin=/usr/share/qt4/bin --with-qwt-include=/usr/include/qwt-qt4 --with-qwt-libdir=/usr/lib
    77
    88DEB_MAKE_CHECK_TARGET = check
Note: See TracChangeset for help on using the changeset viewer.