Changeset f08ae7 for src

Timestamp:

Oct 10, 2011, 4:58:24 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

bae8b0

Parents:

78d5b2

git-author:

Frederik Heber <heber@…> (09/07/11 16:35:59)

git-committer:

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

Message:

Extension of usage of Tsuna's boost.m4 macro.

• boost.m4 from ​https://github.com/tsuna/boost.m4.git (serial 16 + updates).
• LinearAlgebra does not depend on any boost libs only two headers and CodePatterns.
• Presence and Usability of every boost header and lib is now checked.
• Using updated ax_codepatterns.m4.
• FIX: boost has not been possible to link with if not residing under some default path. This is now possible.

Location:

src

Files:

• Actions/unittests/Makefile.am (modified) (3 diffs)
• Makefile.am (modified) (1 diff)
• RandomNumbers/Makefile.am (modified) (1 diff)
• RandomNumbers/unittests/Makefile.am (modified) (1 diff)
• UIElements/Makefile.am (modified) (1 diff)
• unittests/Makefile.am (modified) (2 diffs)

src/Actions/unittests/Makefile.am

@@ -27 +27 @@
         ../libMolecuilderUI.la
 
+# note that DummyUI inherits Dialog which depends on boost/file_system ...
+
 ActionRegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../Actions/unittests/ActionRegistryUnitTest.cpp \
@@ -36 +38 @@
         ../Actions/unittests/ActionSequenceUnitTest.hpp \
         ../Actions/unittests/stubs/DummyUI.hpp
-ActionSequenceUnitTest_LDADD = ${ACTIONLIBS}
+ActionSequenceUnitTest_LDADD = \
+        ${ACTIONLIBS} \
+        $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
+        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
 AtomsCalculationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
@@ -47 +52 @@
         ../Actions/unittests/ManipulateAtomsUnitTest.hpp \
         ../Actions/unittests/stubs/DummyUI.hpp
-ManipulateAtomsUnitTest_LDADD = ${ACTIONLIBS}
+ManipulateAtomsUnitTest_LDADD = \
+        ${ACTIONLIBS} \
+        $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
+        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
 

src/Makefile.am

@@ -14 +14 @@
 include UIElements/Makefile.am
 
-AM_LDFLAGS = -ldl
+AM_LDFLAGS = -ldl ${BOOST_LDFLAGS}
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 

src/RandomNumbers/Makefile.am

@@ -5 +5 @@
 
 # Position-Independent Code necessary for shared library
-#AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
+#AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl ${BOOST_LDFLAGS}
 #AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
 

src/RandomNumbers/unittests/Makefile.am

@@ -4 +4 @@
 #INCLUDES = -I$(top_srcdir)/src
 
-#AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
+#AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl ${BOOST_LDFLAGS}
 #AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
 

src/UIElements/Makefile.am

@@ -271 +271 @@
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         libMolecuilderRandomNumbers.la \
-        $(CodePatterns_LIBS) \
-        $(BOOST_FILESYSTEM_LIBS) \
-        $(BOOST_PROGRAM_OPTIONS_LIBS) \
-        $(BOOST_SYSTEM_LIBS)
+        ${CodePatterns_LIBS} \
+        $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
+        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
 libMolecuilderQtUI_la_LIBADD = \
-       ${QT_LIBS} \
-       -lQtOpenGL \
-       ${GLU_LIBS}
+        ${QT_LIBS} \
+        -lQtOpenGL \
+        ${GLU_LIBS}
 
 

src/unittests/Makefile.am

@@ -16 +16 @@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
+AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
 
@@ -43 +43 @@
 noinst_PROGRAMS += $(GENERALTESTS) TestRunner
 
-BOOST_LIB = $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS)
+BOOST_LIB = \
+        $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS)
 
 ALLLIBS = \