From 3097ea187c8b5da38be05a522d7d5e9c326fe4a0 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Tue, 17 Apr 2018 10:51:29 +0200 Subject: [PATCH] fixing installation without linear algebra --- configure.ac | 13 ++++++------- m4/ax_petsc_lib.m4 | 2 +- src/DMatrix/tests/EMatrix_unit_tests.cpp | 4 ++++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 23d6afe..96e9c00 100755 --- a/configure.ac +++ b/configure.ac @@ -122,13 +122,6 @@ if test x"$with_hdf5" = x"no"; then exit 207 fi - -########## - -## Check for PETSC - -AX_LIB_PETSC() - ######### ###### Check for test coverage @@ -314,6 +307,12 @@ AX_LAPACK([],[]) AX_SUITESPARSE([],[]) +########## + +## Check for PETSC + +AX_LIB_PETSC() + ###### Checking for EIGEN AX_EIGEN([],[]) diff --git a/m4/ax_petsc_lib.m4 b/m4/ax_petsc_lib.m4 index 1bd1590..ba7fff8 100755 --- a/m4/ax_petsc_lib.m4 +++ b/m4/ax_petsc_lib.m4 @@ -105,7 +105,7 @@ AC_DEFUN([AX_LIB_PETSC], [ AX_OPENMP([CFLAGS="$OPENMP_CFLAGS" LDFLAGS="$OPENMP_LDFLAGS"],[]) CFLAGS="$CFLAGS -I$with_petsc/include $HDF5_INCLUDE $METIS_INCLUDE " - LDFLAGS="$LDFLAGS -L$with_petsc/lib $HDF5_LDFLAGS $HDF5_LIBS $METIS_LIB -lmetis " + LDFLAGS="$LDFLAGS -L$with_petsc/lib $HDF5_LDFLAGS $HDF5_LIBS $METIS_LIB -lmetis $SUITESPARSE_LIBS" CC=$CXX AC_LANG_SAVE diff --git a/src/DMatrix/tests/EMatrix_unit_tests.cpp b/src/DMatrix/tests/EMatrix_unit_tests.cpp index 3954bdd..741803b 100644 --- a/src/DMatrix/tests/EMatrix_unit_tests.cpp +++ b/src/DMatrix/tests/EMatrix_unit_tests.cpp @@ -10,6 +10,8 @@ #include "DMatrix/EMatrix.hpp" #include "memory/HeapMemory.hpp" +#ifdef HAVE_EIGEN + BOOST_AUTO_TEST_SUITE (EMatrix_test) BOOST_AUTO_TEST_CASE( EMatrix_test_use) @@ -102,3 +104,5 @@ BOOST_AUTO_TEST_CASE( EMatrix_test_use) BOOST_AUTO_TEST_SUITE_END() + +#endif -- GitLab