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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/JobMarket/src/unittests/Makefile.am

    r363f28 r2f5562  
    1010lib_LTLIBRARIES =
    1111
    12 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
     12AM_LDFLAGS = ${CodePatterns_LDFLAGS} $(CPPUNIT_LDFLAGS) -ldl
    1313AM_CPPFLAGS = -I$(top_srcdir)/src $(CPPUNIT_CFLAGS) $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
    1414
    … …  
    5050  $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
    5151  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    52   ${CodePatterns_LIBS}
     52  ${CodePatterns_LIBS} \
     53  $(CPPUNIT_LIBS)
    5354
    54 FragmentJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    5555FragmentJobUnitTest_SOURCES = UnitTestMain.cpp \
    5656  FragmentJobUnitTest.cpp \
    … …  
    6060  stubs/FragmentJobStub.hpp
    6161FragmentJobUnitTest_LDADD = \
    62   ../JobMarket/libJobMarketJobs.la \
    63   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    64   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    65   ${CodePatterns_LIBS}
     62  ${FRAGMENTATIONAUTOMATIONLIBS}
    6663
    67 FragmentQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    6864FragmentQueueUnitTest_SOURCES = UnitTestMain.cpp \
    6965  FragmentQueueUnitTest.cpp \
    … …  
    7470  stubs/ObserverStub.hpp
    7571FragmentQueueUnitTest_LDADD = \
    76   ../JobMarket/libJobMarketJobs.la \
    77   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    78   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    79   ${CodePatterns_LIBS}
     72  ${FRAGMENTATIONAUTOMATIONLIBS}
    8073
    81 FragmentResultUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    8274FragmentResultUnitTest_SOURCES = UnitTestMain.cpp \
    8375  FragmentResultUnitTest.cpp \
    8476  FragmentResultUnitTest.hpp
    8577FragmentResultUnitTest_LDADD = \
    86         ../JobMarket/libJobMarketJobs.la \
    87   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    88   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    89   ${CodePatterns_LIBS}
     78  ${FRAGMENTATIONAUTOMATIONLIBS}
    9079
    91 OperationQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    9280OperationQueueUnitTest_SOURCES = UnitTestMain.cpp \
    9381  OperationQueueUnitTest.cpp \
    … …  
    9583  stubs/AsyncOperationStub.hpp
    9684OperationQueueUnitTest_LDADD = \
    97         ../JobMarket/libJobMarketOperations.la \
    98         ../JobMarket/libJobMarketJobs.la \
    99         ../JobMarket/libJobMarketHelper.la \
     85  ../JobMarket/libJobMarketOperations.la \
     86  ../JobMarket/libJobMarketJobs.la \
     87  ../JobMarket/libJobMarketHelper.la \
    10088  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    101   ${CodePatterns_LIBS}
     89  ${CodePatterns_LIBS} \
     90  $(CPPUNIT_LIBS)
    10291
    103 SystemCommandJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    10492SystemCommandJobUnitTest_SOURCES = UnitTestMain.cpp \
    10593  SystemCommandJobUnitTest.cpp \
    10694  SystemCommandJobUnitTest.hpp
    10795SystemCommandJobUnitTest_LDADD = \
    108         ../JobMarket/libJobMarketJobs.la \
    109   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
     96  ${FRAGMENTATIONAUTOMATIONLIBS} \
    11097  $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_IOSTREAMS_LIBS) \
    111   $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
    112   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    113   ${CodePatterns_LIBS}
     98  $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS)
    11499
    115 WorkerAddressUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    116100WorkerAddressUnitTest_SOURCES = UnitTestMain.cpp \
    117101  WorkerAddressUnitTest.cpp \
    118102  WorkerAddressUnitTest.hpp
    119103WorkerAddressUnitTest_LDADD = \
    120         ../JobMarket/libJobMarketHelper.la \
    121   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    122   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    123   ${CodePatterns_LIBS}
     104  ../JobMarket/libJobMarketHelper.la \
     105  ${FRAGMENTATIONAUTOMATIONLIBS}
    124106
    125 WorkerPoolUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    126107WorkerPoolUnitTest_SOURCES = UnitTestMain.cpp \
    127108  WorkerPoolUnitTest.cpp \
    … …  
    130111  stubs/ObserverStub.hpp
    131112WorkerPoolUnitTest_LDADD = \
    132         ../JobMarket/libJobMarketPool.la \
    133         ../JobMarket/libJobMarketHelper.la \
     113  ../JobMarket/libJobMarketPool.la \
     114  ../JobMarket/libJobMarketHelper.la \
    134115  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    135116  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    136   ${CodePatterns_LIBS}
     117  ${CodePatterns_LIBS} \
     118  $(CPPUNIT_LIBS)
    137119
    138120#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.