Changeset 72461c for ThirdParty/mpqc_open/src/lib/math

Timestamp:

Mar 2, 2017, 12:28:37 PM (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, 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:

0035ea

Parents:

1513599

git-author:

Frederik Heber <heber@…> (02/10/17 09:58:41)

git-committer:

Frederik Heber <heber@…> (03/02/17 12:28:37)

Message:

SRCDIR is now added to CPPFLAGS of tests that need it, added .in file to EXTRA_DIST.

Location:

ThirdParty/mpqc_open/src/lib/math

Files:

• isosurf/Makefile.am (modified) (2 diffs)
• optimize/Makefile.am (modified) (3 diffs)
• scmat/Makefile.am (modified) (4 diffs)

ThirdParty/mpqc_open/src/lib/math/isosurf/Makefile.am

@@ -80 +80 @@
 isotest_SOURCES = \
         math/isosurf/isotest.cc
-#isotest_CPPFLAGS = \
+isotest_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR=\"$(srcdir)/math/isosurf\"
 #       $(AM_CPPFLAGS:-fno-implicit-templates=)
 isotest_LDADD = \
@@ -86 +86 @@
 
 
+EXTRA_DIST += ./math/isosurf/isotest.in

ThirdParty/mpqc_open/src/lib/math/optimize/Makefile.am

@@ -89 +89 @@
 opttest_SOURCES = \
         math/optimize/opttest.cc
+opttest_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR=\"$(srcdir)/math/optimize\"
 opttest_LDADD = \
         $(OPTIMIZELIBS)
@@ -94 +95 @@
 scextest_optimize_SOURCES = \
         math/optimize/scextest.cc
+scextest_optimize_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR=\"$(srcdir)/math/optimize\"
 scextest_optimize_LDADD = \
         $(OPTIMIZELIBS)
@@ -102 +104 @@
         $(OPTIMIZELIBS)
 
+EXTRA_DIST += ./math/optimize/opttest.in
+EXTRA_DIST += ./math/optimize/scextest.in

ThirdParty/mpqc_open/src/lib/math/scmat/Makefile.am

@@ -128 +128 @@
 localtest_SOURCES = \
         math/scmat/localtest.cc
+localtest_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR=\"$(srcdir)/math/scmat\"
 localtest_LDADD = \
         libSCscmat_matrixtest.la \
@@ -134 +135 @@
 repltest_SOURCES = \
         math/scmat/repltest.cc
+repltest_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR=\"$(srcdir)/math/scmat\"
 repltest_LDADD = \
         libSCscmat_matrixtest.la \
@@ -140 +142 @@
 disttest_SOURCES = \
         math/scmat/disttest.cc
+disttest_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR=\"$(srcdir)/math/scmat\"
 disttest_LDADD = \
         libSCscmat_matrixtest.la \
@@ -146 +149 @@
 blockedtest_SOURCES = \
         math/scmat/blockedtest.cc
+blockedtest_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR=\"$(srcdir)/math/scmat\"
 blockedtest_LDADD = \
         libSCscmat_matrixtest.la \
         $(SCMATLIBS)
 
+EXTRA_DIST += ./math/scmat/f77sym.in
+EXTRA_DIST += ./math/scmat/matrixtest.in