From: turcksin Date: Thu, 20 Mar 2014 20:57:13 +0000 (+0000) Subject: Merge from trunk. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5f370fa13f3cdd9f4c948211d13d1ea6e855860;p=dealii-svn.git Merge from trunk. git-svn-id: https://svn.dealii.org/branches/branch_paralution@32675 0785d39b-7218-0410-832d-ea1e28bc413d --- d5f370fa13f3cdd9f4c948211d13d1ea6e855860 diff --cc deal.II/cmake/config/CMakeLists.txt index e37d456fdb,533753878f..11cd692160 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@@ -320,19 -320,18 +320,19 @@@ IF(DEAL_II_COMPONENT_COMPAT_FILES COND_SET_TO_YES(DEAL_II_WITH_FUNCTIONPARSER MAKEFILE_enableparser) COND_SET_TO_YES(BUILD_SHARED_LIBS MAKEFILE_enableshared) - COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC) - COND_SET_TO_YES(DEAL_II_WITH_SLEPC MAKEFILE_SLEPC) - COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS) - COND_SET_TO_YES(DEAL_II_WITH_HDF5 MAKEFILE_HDF5) + COND_SET_TO_YES(DEAL_II_WITH_ARPACK MAKEFILE_ARPACK) COND_SET_TO_YES(DEAL_II_WITH_BLAS MAKEFILE_BLAS) - COND_SET_TO_YES(DEAL_II_WITH_MUMPS MAKEFILE_MUMPS) + COND_SET_TO_YES(DEAL_II_WITH_HDF5 MAKEFILE_HDF5) COND_SET_TO_YES(DEAL_II_WITH_LAPACK MAKEFILE_LAPACK) - COND_SET_TO_YES(DEAL_II_WITH_ARPACK MAKEFILE_ARPACK) COND_SET_TO_YES(DEAL_II_WITH_METIS MAKEFILE_METIS) - COND_SET_TO_YES(DEAL_II_WITH_UMFPACK MAKEFILE_UMFPACK) - COND_SET_TO_YES(DEAL_II_WITH_P4EST MAKEFILE_P4EST) COND_SET_TO_YES(DEAL_II_WITH_MPI MAKEFILE_MPI) + COND_SET_TO_YES(DEAL_II_WITH_MUMPS MAKEFILE_MUMPS) + COND_SET_TO_YES(DEAL_II_WITH_P4EST MAKEFILE_P4EST) + COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC) + COND_SET_TO_YES(DEAL_II_WITH_SLEPC MAKEFILE_SLEPC) + COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS) + COND_SET_TO_YES(DEAL_II_WITH_UMFPACK MAKEFILE_UMFPACK) + COND_SET_TO_YES(DEAL_II_WITH_PARALUTION MAKEFILE_PARALUTION) # # For binary dir: diff --cc deal.II/cmake/scripts/run_testsuite.cmake index 7c6f1229b1,bcc9e12fdb..67976ab0c8 --- a/deal.II/cmake/scripts/run_testsuite.cmake +++ b/deal.II/cmake/scripts/run_testsuite.cmake @@@ -276,7 -276,7 +276,7 @@@ FOREACH(_var ${_variables} _var MATCHES "^(COMPAT_FILES|DOCUMENTATION|EXAMPLES|MESH_CONVERTER|PARAMETER_GUI)" OR _var MATCHES "^(ARPACK|BOOST|FUNCTIONPARSER|HDF5|METIS|MPI|MUMPS)_" OR _var MATCHES "^(NETCDF|P4EST|PETSC|SLEPC|THREADS|TBB|TRILINOS)_" OR - _var MATCHES "^(UMFPACK|ZLIB|LAPACK|PARALUTION)_" OR - _var MATCHES "^(UMFPACK|ZLIB|LAPACK|MUPARSER)_" OR ++ _var MATCHES "^(UMFPACK|ZLIB|LAPACK|MUPARSER|PARALUTION)_" OR _var MATCHES "^(CMAKE|DEAL_II)_(C|CXX|Fortran|BUILD)_(COMPILER|FLAGS)" OR _var MATCHES "^CMAKE_BUILD_TYPE$" OR _var MATCHES "MAKEOPTS" OR