Changeset 0cfc27

Timestamp:

Dec 14, 2012, 2:29:45 PM (12 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:

e85169

Parents:

7ace68

git-author:

Frederik Heber <heber@…> (04/24/12 10:34:28)

git-committer:

Frederik Heber <heber@…> (12/14/12 14:29:45)

Message:

If no CPPUNIT is found, compilation of unit tests is disabled.

• uses conditional CONDCPPUNIT.

Files:

• LinearAlgebra/configure.ac (modified) (1 diff)
• LinearAlgebra/src/unittests/Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• src/unittests/Makefile.am (modified) (2 diffs)

LinearAlgebra/configure.ac

@@ -15 +15 @@
 
 # Checks for programs.
-AM_PATH_CPPUNIT(1.9.6)
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
+
+# check for cppunit (taken from svn.apache.org/../xmlbeanscxx)
+AM_PATH_CPPUNIT(1.9.6)
+AM_CONDITIONAL(CONDCPPUNIT, test "$CPPUNIT_LIBS")
 
 DX_HTML_FEATURE(ON)

LinearAlgebra/src/unittests/Makefile.am

@@ -6 +6 @@
 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 AM_CPPFLAGS = $(CPPUNIT_CFLAGS) $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
+
+if CONDCPPUNIT
 
 TESTS = \
@@ -106 +108 @@
 
 #AUTOMAKE_OPTIONS = parallel-tests
+
+endif

configure.ac

@@ -16 +16 @@
 
 # Checks for programs.
-AM_PATH_CPPUNIT(1.9.6)
 AC_PROG_CXX
 AC_PROG_INSTALL
+
+# check for cppunit (taken from svn.apache.org/../xmlbeanscxx)
+AM_PATH_CPPUNIT(1.9.6)
+AM_CONDITIONAL(CONDCPPUNIT, test "$CPPUNIT_LIBS")
 
 dnl Check if we have enable python

src/unittests/Makefile.am

@@ -6 +6 @@
 TESTS =
 XFAIL_TESTS =
+
+if CONDCPPUNIT
 
 include ../../src/Actions/unittests/Makefile.am
@@ -193 +195 @@
 
 #AUTOMAKE_OPTIONS = parallel-tests
+
+endif