Changeset 251420 for ThirdParty/mpqc_open/src/lib/math/isosurf

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:

6b1a6a

Parents:

2e2505

git-author:

Frederik Heber <heber@…> (02/09/17 15:10:39)

git-committer:

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

Message:

Fixed all src/lib's Makefile.am's linking.

Location:

ThirdParty/mpqc_open/src/lib/math/isosurf

Files:

• Makefile.am (modified) (3 diffs)
• tmplinst.cc (modified) (1 diff)

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

@@ -8 +8 @@
         math/isosurf/surfse.cc \
         math/isosurf/surfst.cc \
+        math/isosurf/tmplinst.cc \
         math/isosurf/triangle.cc \
         math/isosurf/tricoef.cc \
@@ -68 +69 @@
 
 ISOSURFTESTS = \
-        tmplinst \
         isotest
 
@@ -75 +75 @@
 
 ISOSURFLIBS = \
-        libSCkeyval.la \
-        libSCgroup.la libSCisosurf.la libSCclass.la \
-        libSCcontainer.la libSCref.la libSCmisc.la
-
-tmplinst_SOURCES = \
-        math/isosurf/tmplinst.cc
-tmplinst_LDADD = \
-        $(ISOSURFLIBS)
+        libSCisosurf.la libSCoptimize.la libSCscmat.la libSCgroup.la libSCrender.la libSCmisc.la libSCstate.la libSCkeyval.la libSCclass.la libSCcontainer.la libSCref.la
 
 isotest_SOURCES = \
         math/isosurf/isotest.cc
+#isotest_CPPFLAGS = \
+#       $(AM_CPPFLAGS:-fno-implicit-templates=)
 isotest_LDADD = \
         $(ISOSURFLIBS)

ThirdParty/mpqc_open/src/lib/math/isosurf/tmplinst.cc

@@ -33 +33 @@
 
 #include <vector>
+
+extern int yylex(void);
 
 using namespace sc;