Changeset 4d4ef8 for src/Jobs/Makefile.am

Timestamp:

Feb 13, 2013, 3:47:46 PM (12 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:

d5b458

Parents:

cf1d82

git-author:

Frederik Heber <heber@…> (01/14/13 16:57:23)

git-committer:

Frederik Heber <heber@…> (02/13/13 15:47:46)

Message:

FIX: Enforce binding to libMolecuilderJobs for Server and PoolWorker.

• otherwise we are puzzled why Server does receive an empty vector of jobs although job id have been transferred flawlessly before. If the library dependency is not listed, the executables cannot instantiate class.
• the remedy is again to create a static instance. We did this for MPQCCommandJob, VMGJob, and VMGDebugGridJob. Each has a specific _binding header which just has to be included.

File:

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

src/Jobs/Makefile.am

@@ -3 +3 @@
 
 JOBSSOURCE = \
-        Jobs/MPQCCommandJob.cpp \
-        Jobs/MPQCData.cpp \
-        Jobs/MPQCJob.cpp
+        Jobs/MPQCCommandJob.cpp \
+        Jobs/MPQCData.cpp \
+        Jobs/MPQCJob.cpp
 if CONDVMG
 JOBSSOURCE += \
@@ -16 +16 @@
 
 JOBSHEADER = \
-        Jobs/MPQCCommandJob.hpp \
-        Jobs/MPQCData.hpp \
-        Jobs/MPQCDataFused.hpp \
-        Jobs/MPQCDataMap.hpp \
-        Jobs/MPQCData_printKeyNames.hpp \
-        Jobs/MPQCJob.hpp 
+        Jobs/MPQCCommandJob.hpp \
+        Jobs/MPQCCommandJob_binding.hpp \
+        Jobs/MPQCData.hpp \
+        Jobs/MPQCDataFused.hpp \
+        Jobs/MPQCDataMap.hpp \
+        Jobs/MPQCData_printKeyNames.hpp \
+        Jobs/MPQCJob.hpp 
 if CONDVMG
 JOBSHEADER += \
@@ -27 +28 @@
         Jobs/InterfaceVMGJob.hpp \
         Jobs/VMGData.hpp \
-  Jobs/VMGDataFused.hpp \
-  Jobs/VMGDataMap.hpp \
-  Jobs/VMGData_printKeyNames.hpp \
+        Jobs/VMGDataFused.hpp \
+        Jobs/VMGDataMap.hpp \
+        Jobs/VMGData_printKeyNames.hpp \
         Jobs/VMGDebugGridJob.hpp \
-        Jobs/VMGJob.hpp
+        Jobs/VMGDebugGridJob_binding.hpp \
+        Jobs/VMGJob.hpp \
+        Jobs/VMGJob_binding.hpp
 endif
 
@@ -45 +48 @@
 libMolecuilderJobs_la_SOURCES = $(JOBSSOURCE)
 libMolecuilderJobs_la_LIBADD = \
-  libMolecuilderJobsGrid.la \
-  $(VMG_LIBS) \
+  libMolecuilderJobsGrid.la
+if CONDVMG
+libMolecuilderJobs_la_LIBADD += \
+  $(VMG_LIBS)
+endif
+libMolecuilderJobs_la_LIBADD += \
   $(JobMarket_LIBS) \
   $(BOOST_SERIALIZATION_LIBS) \