Changeset d5240d for src


Ignore:
Timestamp:
Dec 4, 2010, 11:47:35 PM (14 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:
c82d0c
Parents:
ae21cbd
git-author:
Frederik Heber <heber@…> (11/11/10 14:39:10)
git-committer:
Frederik Heber <heber@…> (12/04/10 23:47:35)
Message:

FIX: Linking to non-system boost is working now.

  • FIX: BOOST_CPPFLAGS was not present in AM_CPPFLAGS in all Makefile.am
  • Hence, not the correct includes were used and linking occured with undefined reference errors (because of version conflict between system-wide installed and non-system boost)
  • validate()s now make version check of boost as signature of validation_error)_ changed in boost 1.42
  • added AX_BOOST_SYSTEM to configure.ac and BOOST_SYSTEM_LIB to src/Makefile.am and src/unittests/Makefile.am. Otherwise we have to set an rpath to let it find the lib needed by other boost libs in non-system boost configs.
Location:
src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/Makefile.am

    rae21cbd rd5240d  
    66AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
    77AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
     8AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    89
    910ACTIONSSOURCE = \

  • src/Exceptions/Makefile.am

    rae21cbd rd5240d  
    77# Position-Independent Code necessary for shared library
    88AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
     9AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    910
    1011EXCEPTIONSOURCE = \

  • src/Helpers/Makefile.am

    rae21cbd rd5240d  
    77# Position-Independent Code necessary for shared library
    88AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
     9AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    910
    1011# this includes source files that need to be present at multiple points

  • src/LinearAlgebra/Makefile.am

    rae21cbd rd5240d  
    77# Position-Independent Code necessary for shared library
    88AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
     9AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    910
    1011LINALGSOURCE = \

  • src/Makefile.am

    rae21cbd rd5240d  
    33
    44SUBDIRS = Actions Exceptions Helpers LinearAlgebra Parser UIElements
     5
     6AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    57
    68ATOMSOURCE = \
    … …  
    270272
    271273
    272 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB)
    273 GUI_LIBS = ${QT_LDADD} ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS}
     274BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    274275INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
    275276
    … …  
    300301#Stuff for building the GUI using Qt
    301302molecuildergui_SOURCES = builder.cpp
    302 molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} -DUSE_GUI_QT
    303 molecuildergui_LDFLAGS = $(BOOST_LIB) ${QT_LDFLAGS} ${GLU_LDFLAGS}
     303molecuildergui_CXXFLAGS = $(BOOST_CPPFLAGS) -DUSE_GUI_QT
     304molecuildergui_LDFLAGS = $(BOOST_LIB)
    304305
    305306unity_SOURCES = unity.cpp
    … …  
    372373        echo "#include \"$(srcdir)/version.c\"" >> unity.cpp;
    373374
    374 MOSTLYCLEANFILES = allmocs.moc.cpp unity.cpp
     375MOSTLYCLEANFILES = unity.cpp
    375376       

  • src/Parser/Makefile.am

    rae21cbd rd5240d  
    66AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
    77AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
     8AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    89
    910PARSERSOURCE = \

  • src/UIElements/CommandLineUI/CommandLineParser_validate.cpp

    rae21cbd rd5240d  
    1919
    2020#include "Helpers/MemDebug.hpp"
     21
     22#include <boost/version.hpp>
    2123
    2224#include <iostream>
    … …  
    4143  if (values.size() != 1) {
    4244    std::cerr <<  "Not one vector but " << values.size() << " given " << std::endl;
     45#if BOOST_VERSION < 104200
    4346    throw boost::program_options::validation_error("Unequal to one vector given");
     47#else
     48    throw boost::program_options::validation_error(
     49        boost::program_options::validation_error::invalid_option_value,
     50        std::string("value"),
     51        std::string("VectorValue")
     52    );
     53#endif
    4454  }
    4555  std::string argument(values.at(0));
    … …  
    5969  if (components.size() != 3) {
    6070    std::cerr <<  "Specified vector does not have three components but " << components.size() << std::endl;
     71#if BOOST_VERSION < 104200
    6172    throw boost::program_options::validation_error("Specified vector does not have three components");
     73#else
     74    throw boost::program_options::validation_error(
     75        boost::program_options::validation_error::invalid_option_value,
     76        std::string("value"),
     77        std::string("VectorValue")
     78    );
     79#endif
    6280  }
    6381  VV.x = boost::lexical_cast<double>(components.at(0));
    … …  
    7593  if (values.size() != 1) {
    7694    std::cerr <<  "Not one vector but " << values.size() << " given " << std::endl;
     95#if BOOST_VERSION < 104200
    7796    throw boost::program_options::validation_error("Unequal to one vector given");
     97#else
     98    throw boost::program_options::validation_error(
     99        boost::program_options::validation_error::invalid_option_value,
     100        std::string("value"),
     101        std::string("BoxValue")
     102    );
     103#endif
    78104  }
    79105  std::string argument(values.at(0));
    … …  
    93119  if (components.size() != 6) {
    94120    std::cerr <<  "Specified vector does not have three components but " << components.size() << std::endl;
     121#if BOOST_VERSION < 104200
    95122    throw boost::program_options::validation_error("Specified symmetric box matrix does not have six components");
     123#else
     124    throw boost::program_options::validation_error(
     125        boost::program_options::validation_error::invalid_option_value,
     126        std::string("value"),
     127        std::string("BoxValue")
     128    );
     129#endif
    96130  }
    97131  BV.xx = boost::lexical_cast<double>(components.at(0));
    … …  
    120154  if (values.size() != 1) {
    121155    std::cerr <<  "Not one file but " << values.size() << " given " << std::endl;
     156#if BOOST_VERSION < 104200
    122157    throw boost::program_options::validation_error("Unequal to one file given");
     158#else
     159    if (values.size() == 0) {
     160      throw boost::program_options::validation_error(
     161          boost::program_options::validation_error::at_least_one_value_required,
     162          std::string("value"),
     163          std::string("boost::filesystem::path")
     164      );
     165    } else {
     166      throw boost::program_options::validation_error(
     167          boost::program_options::validation_error::multiple_values_not_allowed,
     168          std::string("value"),
     169          std::string("boost::filesystem::path")
     170      );
     171    }
     172#endif
    123173  }
    124174  filename = values.at(0);

  • src/UIElements/Makefile.am

    rae21cbd rd5240d  
    55AM_LDFLAGS = -ldl
    66AM_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS}
    7 
     7AM_CPPFLAGS = ${BOOST_CPPFLAGS}
     8 
    89VIEWSOURCE = \
    910  Views/View.cpp \
    … …  
    227228QTUI_DEFS =
    228229
     230GUI_LIBS =
    229231
    230232
    … …  
    233235libMolecuilderUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
    234236libMolecuilderQtUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
    235 libMolecuilderUI_LIBS = \
     237libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LIBS = \
    236238        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
    237 libMolecuilderQtUI_LIBS = \
     239libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LIBS = \
    238240        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
     241
     242libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LIBADD = ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS} ${QT_LDADD}
    239243
    240244nobase_libMolecuilderUI_include_HEADERS = ${UIHEADER}
    … …  
    302306
    303307       
    304 MOSTLYCLEANFILES = unity.cpp
     308MOSTLYCLEANFILES = unity.cpp allmocs.moc.cpp

  • src/unittests/Makefile.am

    rae21cbd rd5240d  
    66AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
    77AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
     8AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    89
    910TESTS = \
    … …  
    5152noinst_PROGRAMS = $(TESTS) TestRunner
    5253
    53 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB)
     54BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    5455GSLLIBS = \
    5556        ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
Note: See TracChangeset for help on using the changeset viewer.