Changeset a91710 for src/unittests

Timestamp:

Aug 21, 2014, 6:59:33 AM (11 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, Candidate_v1.7.0, 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:

29b35e

Parents:

4c9101 (diff), 0c72e2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'Fixes_Ubuntu14_04' into stable

File:

• src/unittests/Makefile.am (modified) (7 diffs)

src/unittests/Makefile.am

@@ -7 +7 @@
 XFAIL_TESTS =
 MOSTLYCLEANFILES =
+noinst_LTLIBRARIES =
+
+#AUTOMAKE_OPTIONS = no-dependencies
 
 if CONDCPPUNIT
@@ -40 +43 @@
 include ../../src/UIElements/Menu/unittests/Makefile.am
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src 
-
 AM_LDFLAGS = \
         ${CodePatterns_LIBS} \
         $(CPPUNIT_LIBS) \
         -ldl
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
 
 GENERALTESTS = \
@@ -68 +69 @@
 endif
 
+noinst_LTLIBRARIES += libUnitTest.la
+libUnitTest_la_LDFLAGS = \
+        $(AM_LDFLAGS)
+libUnitTest_la_LIBADD =
+
+#nobase_libUnitTest_la_include_HEADERS =
+
+## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
+## target.  Note that @MOLECUILDER_API_VERSION@ is not interpreted by Automake and
+## will therefore be treated as if it were literally part of the target name,
+## and the variable name derived from that.
+## The file extension .cc is recognized by Automake, and makes it produce
+## rules which invoke the C++ compiler to produce a libtool object file (.lo)
+## from each source file.  Note that it is not necessary to list header files
+## which are already listed elsewhere in a _HEADERS variable assignment.
+libUnitTest_la_SOURCES = UnitTestMain.cpp
+
+## Instruct libtool to include ABI version information in the generated shared
+## library file (.so).  The library ABI version is defined in configure.ac, so
+## that all version information is kept in one place.
+#libUnitTest_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+
+## The generated configuration header is installed in its own subdirectory of
+## $(libdir).  The reason for this is that the configuration information put
+## into this header file describes the target platform the installed library
+## has been built for.  Thus the file must not be installed into a location
+## intended for architecture-independent files, as defined by the Filesystem
+## Hierarchy Standard (FHS).
+## The nodist_ prefix instructs Automake to not generate rules for including
+## the listed files in the distribution on 'make dist'.  Files that are listed
+## in _HEADERS variables are normally included in the distribution, but the
+## configuration header file is generated at configure time and should not be
+## shipped with the source tarball.
+#libUnitTest_la_libincludedir = $(libdir)/MoleCuilder/include
+#nodist_libUnitTest_la_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
+
+## Install the generated pkg-config file (.pc) into the expected location for
+## architecture-dependent package configuration information.  Occasionally,
+## pkg-config files are also used for architecture-independent data packages,
+## in which case the correct install location would be $(datadir)/pkgconfig.
+#pkgconfigdir = $(libdir)/pkgconfig
+#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
+
 
 BOOST_LIB = \
@@ -83 +127 @@
 
 ALLLIBS = \
+        libUnitTest.la \
+        ../libMolecuilder.la \
         ../libMolecuilderUI.la
 if CONDJOBMARKET
@@ -146 +192 @@
   
 
-BoxUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+BoxUnitTest_SOURCES = \
         BoxUnitTest.cpp \
         BoxUnitTest.hpp \
@@ -154 +200 @@
         ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
 BoxUnitTest_LDADD = \
-        ../libMolecuilder.la \
-        ../libMolecuilderShapes.la \
-        ../libMolecuilderHelpers.la \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
-
-AtomIdSetUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        $(ALLLIBS) \
+        ../libMolecuilderShapes.la \
+        ../libMolecuilderHelpers.la
+
+AtomIdSetUnitTest_SOURCES = \
         AtomIdSetUnitTest.cpp \
         AtomIdSetUnitTest.hpp
 AtomIdSetUnitTest_LDADD =  $(ALLLIBS)
 
-Box_BoundaryConditionsTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+Box_BoundaryConditionsTest_SOURCES = \
         Box_BoundaryConditionsUnitTest.cpp \
-        Box_BoundaryConditionsUnitTest.hpp \
-        ../Box_BoundaryConditions.cpp \
-        ../Box_BoundaryConditions.hpp
+        Box_BoundaryConditionsUnitTest.hpp
 Box_BoundaryConditionsTest_LDADD = \
-        ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
-
-FormulaUnittest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        $(ALLLIBS) \
+        ../libMolecuilderShapes.la \
+        ../libMolecuilderHelpers.la
+
+FormulaUnittest_SOURCES = \
         FormulaUnitTest.cpp \
         FormulaUnitTest.hpp
 FormulaUnittest_LDADD = $(ALLLIBS)
 
-ListOfBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ListOfBondsUnitTest_SOURCES = \
         ListOfBondsUnitTest.cpp \
         ListOfBondsUnitTest.hpp 
 ListOfBondsUnitTest_LDADD = $(ALLLIBS)
 
-MoleculeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+MoleculeUnitTest_SOURCES = \
         MoleculeUnitTest.cpp \
         MoleculeUnitTest.hpp
@@ -193 +235 @@
         ../libMolecuilderHelpers.la
 
-WorldTimeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+WorldTimeUnitTest_SOURCES = \
         WorldTimeUnitTest.cpp \
-        WorldTimeUnitTest.hpp \
-        ../WorldTime.cpp \
-        ../WorldTime.hpp
-WorldTimeUnitTest_LDADD = ${BOOST_LIB}
+        WorldTimeUnitTest.hpp
+WorldTimeUnitTest_LDADD = \
+        $(ALLLIBS) \
+        ../libMolecuilderShapes.la \
+        ../libMolecuilderHelpers.la