From: maier Date: Tue, 5 Mar 2013 10:33:12 +0000 (+0000) Subject: Bugfixes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bceda7f5050d5a8926f066d2bb54ee152efae35;p=dealii-svn.git Bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@28735 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt index 6d57658807..97fb672f78 100644 --- a/deal.II/bundled/CMakeLists.txt +++ b/deal.II/bundled/CMakeLists.txt @@ -95,10 +95,6 @@ SET(UMFPACK_FOLDER "${CMAKE_SOURCE_DIR}/bundled/umfpack") OPTION(DEAL_II_FORCE_BUNDLED_UMFPACK "Always use the bundled umfpack library instead of an external one." OFF) -MARK_AS_ADVANCED( - atlas_LIBRARY - blas_LIBRARY - ) IF(FEATURE_UMFPACK_BUNDLED_CONFIGURED) ADD_SUBDIRECTORY(${UMFPACK_FOLDER}/UMFPACK/Source) diff --git a/deal.II/cmake/configure/configure_hdf5.cmake b/deal.II/cmake/configure/configure_hdf5.cmake index 60882fe32c..89e257fb20 100644 --- a/deal.II/cmake/configure/configure_hdf5.cmake +++ b/deal.II/cmake/configure/configure_hdf5.cmake @@ -16,4 +16,21 @@ # Configuration for the hdf5 library: # +MACRO(FEATURE_HDF5_FIND_EXTERNAL var) + FIND_PACKAGE(HDF5) + + IF(HDF5_FOUND) + IF( (HDF5_WITH_MPI AND DEAL_II_WITH_MPI) + OR + (NOT HDF5_WITH_MPI AND NOT DEAL_II_WITH_MPI)) + SET(${var} TRUE) + ELSE() + MESSAGE(WARNING "\n" + "Could not find a sufficient hdf5 installation: " + "hdf5 has to be configured with the same MPI configuration as deal.II.\n\n" + ) + ENDIF() + ENDIF() +ENDMACRO() + CONFIGURE_FEATURE(HDF5)