Changeset 482400e for ThirdParty/mpqc_open/src/bin

Timestamp:

Mar 2, 2017, 7:39:59 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_levmar, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

73feb7

Parents:

860145

git-author:

Frederik Heber <heber@…> (11/16/16 11:14:10)

git-committer:

Frederik Heber <heber@…> (03/02/17 07:39:59)

Message:

Changes to mpqc_open to be usable as autoconf subdir.

File:

• ThirdParty/mpqc_open/src/bin/mpqc/Makefile (modified) (2 diffs)

ThirdParty/mpqc_open/src/bin/mpqc/Makefile

@@ -4 +4 @@
   SRCDIR=$(shell pwd)
 endif
+BUILDDIR=$(shell pwd)
 
 LOCALMAKEFILE_OPTIONAL = yes
@@ -31 +32 @@
 
 DEFINES += \
-        -DHAVE_JOBMARKET -I/home/heber/packages/JobMarket-1.0.0/include -I/home/heber/workspace_C/JobMarket/build64 -I/home/heber/packages/boost-1.47/include/boost-1_47\
-        -DHAVE_MPQCDATA -I/home/heber/workspace_C/molecuilder/build64/include/MoleCuilder
+        -DHAVE_JOBMARKET -I$(SRCDIR)/$(TOPDIR)/../JobMarket/src -I$(TOPDIR)/../JobMarket -I$(SRCDIR)/$(TOPDIR)/../../src -I$(SRCDIR)/$(TOPDIR)/../LinearAlgebra/src $(BOOST_SYSTEM_CFLAGS)\
+        -DHAVE_MPQCDATA -I$(TOPDIR)/../../src
 
 XDEF =
-XLIBS = -L/home/heber/packages/JobMarket-1.0.0/lib -lJobMarketPoolWorker -Wl,-rpath,/home/heber/packages/JobMarket-1.0.0/lib -Wl,-rpath,/home/heber/packages/boost-1.47/lib -L/home/heber/workspace_C/molecuilder/build64/lib/ -lMolecuilderJobs -Wl,-rpath,/home/heber/workspace_C/molecuilder/build64/lib
+XLIBS = -L$(TOPDIR)/../JobMarket/src/JobMarket/.libs -Wl,-rpath,$(BUILDDIR)/$(TOPDIR)/../JobMarket/src/JobMarket/.libs -lJobMarketPoolWorker -lJobMarket -L$(TOPDIR)/../../src/.libs -Wl,-rpath,$(BUILDDIR)/$(TOPDIR)/../../src/.libs -lMolecuilderJobs -lMolecuilderFragmentationSummation $(BOOST_SYSTEM_LDFLAGS) -lboost_serialization
 ifeq ($(HAVE_SC_SRC_LIB_CHEMISTRY_QC_PSI),yes)
 XDEF += -DHAVE_CHEMISTRY_QC_PSI