Changeset 2cc7faa

Timestamp:

Jun 27, 2014, 9:32:55 PM (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:

786d28

Parents:

1dfe00

git-author:

Frederik Heber <heber@…> (04/23/14 11:25:58)

git-committer:

Frederik Heber <heber@…> (06/27/14 21:32:55)

Message:

LibJobMarket only compiled in if CONDJOBMARKET.

File:

• src/Jobs/Makefile.am (modified) (3 diffs)

src/Jobs/Makefile.am

@@ -55 +55 @@
 libMolecuilderJobs_la_LDFLAGS = $(AM_LDFLAGS) \
   $(BOOST_SERIALIZATION_LDFLAGS) \
-  $(BOOST_SYSTEM_LDFLAGS) \
-  $(JobMarket_LDFLAGS) \
+  $(BOOST_SYSTEM_LDFLAGS)
+if CONDJOBMARKET
+libMolecuilderJobs_la_LDFLAGS += \
+  $(JobMarket_LDFLAGS)
+endif
+
+libMolecuilderJobs_la_LDFLAGS += \
   $(CodePatterns_LDFLAGS)
 libMolecuilderJobs_la_LIBADD = \
@@ -64 +69 @@
   $(VMG_LIBS)
 endif
+
+if CONDJOBMARKET
 libMolecuilderJobs_la_LIBADD += \
-  $(JobMarket_LIBS) \
+  $(JobMarket_LIBS)
+endif
+libMolecuilderJobs_la_LIBADD += \
   $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LIBS) \
@@ -110 +119 @@
 #pkgconfigdir = $(libdir)/pkgconfig
 #pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
-  
+