Changeset 2f5562

Timestamp:

Mar 2, 2017, 7:25:26 AM (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, Automaking_mpqc_open, 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, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_JobMarket, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

99689b

Parents:

363f28

git-author:

Frederik Heber <heber@…> (11/16/16 08:03:32)

git-committer:

Frederik Heber <heber@…> (03/02/17 07:25:26)

Message:

Added JobMarket as ThirdParty module, Missing CodePatterns_LDFLAGS in JobMarket.

Files:

• Makefile.am (modified) (1 diff)
• ThirdParty/JobMarket/configure.ac (modified) (1 diff)
• ThirdParty/JobMarket/src/unittests/Makefile.am (modified) (6 diffs)
• configure.ac (modified) (2 diffs)

Makefile.am

@@ -4 +4 @@
 if COND_COMPILE_CODEPATTERNS
 SUBDIRS += ThirdParty/CodePatterns
+endif
+if COND_COMPILE_JOBMARKET
+SUBDIRS += ThirdParty/JobMarket
 endif
 SUBDIRS += ThirdParty/LinearAlgebra data/icons src src/unittests src/Tesselation/TriangleMatcher src/Bond/AdjacencyMatcher tests utils doc

ThirdParty/JobMarket/configure.ac

@@ -85 +85 @@
 
 # CodePatterns library (requires new global NotificationChannel functions)
-AM_PATH_CODEPATTERNS([1.3.0], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
+AM_PATH_CODEPATTERNS([1.3.2], $have_debug,,[
+        # compile from ThirdParty
+        [CodePatterns_LDFLAGS='-L$(top_builddir)/../CodePatterns/src']
+        [CodePatterns_CFLAGS='-I$(top_srcdir)/../CodePatterns/src']
+        AS_IF([test x"$enable_debug" != x"no"], [
+                [CodePatterns_LIBS='-lcodepatterns-debug']
+        ],[
+                [CodePatterns_LIBS='-lcodepatterns']
+        ])
+        AC_SUBST(CodePatterns_LDFLAGS)
+        AC_SUBST(CodePatterns_CFLAGS)
+        AC_SUBST(CodePatterns_LIBS)
+        #AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])
+])
 
 # boost

ThirdParty/JobMarket/src/unittests/Makefile.am

@@ -10 +10 @@
 lib_LTLIBRARIES =
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
+AM_LDFLAGS = ${CodePatterns_LDFLAGS} $(CPPUNIT_LDFLAGS) -ldl
 AM_CPPFLAGS = -I$(top_srcdir)/src $(CPPUNIT_CFLAGS) $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
 
@@ -50 +50 @@
   $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
+  ${CodePatterns_LIBS} \
+  $(CPPUNIT_LIBS)
 
-FragmentJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 FragmentJobUnitTest_SOURCES = UnitTestMain.cpp \
   FragmentJobUnitTest.cpp \
@@ -60 +60 @@
   stubs/FragmentJobStub.hpp
 FragmentJobUnitTest_LDADD = \
-  ../JobMarket/libJobMarketJobs.la \
-  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
-  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
+  ${FRAGMENTATIONAUTOMATIONLIBS}
 
-FragmentQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 FragmentQueueUnitTest_SOURCES = UnitTestMain.cpp \
   FragmentQueueUnitTest.cpp \
@@ -74 +70 @@
   stubs/ObserverStub.hpp
 FragmentQueueUnitTest_LDADD = \
-  ../JobMarket/libJobMarketJobs.la \
-  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
-  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
+  ${FRAGMENTATIONAUTOMATIONLIBS}
 
-FragmentResultUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 FragmentResultUnitTest_SOURCES = UnitTestMain.cpp \
   FragmentResultUnitTest.cpp \
   FragmentResultUnitTest.hpp
 FragmentResultUnitTest_LDADD = \
-        ../JobMarket/libJobMarketJobs.la \
-  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
-  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
+  ${FRAGMENTATIONAUTOMATIONLIBS}
 
-OperationQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 OperationQueueUnitTest_SOURCES = UnitTestMain.cpp \
   OperationQueueUnitTest.cpp \
@@ -95 +83 @@
   stubs/AsyncOperationStub.hpp
 OperationQueueUnitTest_LDADD = \
-        ../JobMarket/libJobMarketOperations.la \
-        ../JobMarket/libJobMarketJobs.la \
-        ../JobMarket/libJobMarketHelper.la \
+  ../JobMarket/libJobMarketOperations.la \
+  ../JobMarket/libJobMarketJobs.la \
+  ../JobMarket/libJobMarketHelper.la \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
+  ${CodePatterns_LIBS} \
+  $(CPPUNIT_LIBS)
 
-SystemCommandJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 SystemCommandJobUnitTest_SOURCES = UnitTestMain.cpp \
   SystemCommandJobUnitTest.cpp \
   SystemCommandJobUnitTest.hpp
 SystemCommandJobUnitTest_LDADD = \
-        ../JobMarket/libJobMarketJobs.la \
-  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
+  ${FRAGMENTATIONAUTOMATIONLIBS} \
   $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_IOSTREAMS_LIBS) \
-  $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
-  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
+  $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS)
 
-WorkerAddressUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 WorkerAddressUnitTest_SOURCES = UnitTestMain.cpp \
   WorkerAddressUnitTest.cpp \
   WorkerAddressUnitTest.hpp
 WorkerAddressUnitTest_LDADD = \
-        ../JobMarket/libJobMarketHelper.la \
-  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
-  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
+  ../JobMarket/libJobMarketHelper.la \
+  ${FRAGMENTATIONAUTOMATIONLIBS}
 
-WorkerPoolUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 WorkerPoolUnitTest_SOURCES = UnitTestMain.cpp \
   WorkerPoolUnitTest.cpp \
@@ -130 +111 @@
   stubs/ObserverStub.hpp
 WorkerPoolUnitTest_LDADD = \
-        ../JobMarket/libJobMarketPool.la \
-        ../JobMarket/libJobMarketHelper.la \
+  ../JobMarket/libJobMarketPool.la \
+  ../JobMarket/libJobMarketHelper.la \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
+  ${CodePatterns_LIBS} \
+  $(CPPUNIT_LIBS)
 
 #AUTOMAKE_OPTIONS = parallel-tests

configure.ac

@@ -285 +285 @@
   enable_jobmarket="yes")
 AC_MSG_RESULT($enable_jobmarket)
+compile_jobmarket="no"
 AS_IF([test x"$enable_jobmarket" != x"no"],[
   # JobMarket library (needs SystemCommandJob with suffix)
@@ -292 +293 @@
     AC_DEFINE(HAVE_JOBMARKET,1, ["use JobMarket to calculate fragment jobs."])
     ],[
-      enable_jobmarket="no"
+        AC_CONFIG_SUBDIRS([ThirdParty/JobMarket])
+        compile_jobmarket="yes"
+        [JobMarket_CFLAGS='-I$(top_srcdir)/ThirdParty/JobMarket/src']
+        [JobMarket_LDFLAGS='-L$(top_builddir)/ThirdParty/JobMarket/src/JobMarket']
+        [JobMarket_LIBS='-lJobMarket']
+        [JobMarket_Controller_LIBS='-lJobMarketController']
+        [JobMarket_Server_LIBS='-lJobMarketServer']
+        [JobMarket_PoolWorker_LIBS='-lJobMarketPoolWorker']
+        AC_SUBST(JobMarket_CFLAGS)
+        AC_SUBST(JobMarket_LDFLAGS)
+        AC_SUBST(JobMarket_LIBS)
+        AC_SUBST(JobMarket_Controller_LIBS)
+        AC_SUBST(JobMarket_Server_LIBS)
+        AC_SUBST(JobMarket_PoolWorker_LIBS)
     ])
 ]
+AM_CONDITIONAL([COND_COMPILE_JOBMARKET], [test x"$compile_jobmarket" = x"yes"])
 #[
 #  AC_DEFINE(HAVE_JOBMARKET,0, ["use JobMarket to calculate fragment jobs."])