From 05df796d6a8afcfc092e64e408e44b3ab3c4aa89 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 11 Aug 2014 09:17:09 -0500 Subject: [svn-r25526] Merged 25480 from the trunk into the branch --- CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9667dcf..8b8d5c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -693,7 +693,6 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED) endif (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND) endif (HDF5_PACKAGE_EXTLIBS) endif (NOT HDF5_EXTERNALLY_CONFIGURED) - #----------------------------------------------------------------------------- # Option to use threadsafe # Note: Currently CMake only allows configuring of threadsafe on @@ -860,6 +859,16 @@ if (EXISTS "${HDF5_SOURCE_DIR}/hl" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl") endif (EXISTS "${HDF5_SOURCE_DIR}/hl" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl") #----------------------------------------------------------------------------- +# Check if Fortran's default real is double precision. If it is and HL is +# being built then configure should fail due to bug HDFFV-889. +#----------------------------------------------------------------------------- + if (HDF5_BUILD_FORTRAN AND HDF5_BUILD_HL_LIB ) + if (NOT FORTRAN_DEFAULT_REAL_NOT_DOUBLE) + message (FATAL_ERROR " **** Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use HDF5_BUILD_HL_LIB:BOOL=OFF **** ") + endif (NOT FORTRAN_DEFAULT_REAL_NOT_DOUBLE) + endif (HDF5_BUILD_FORTRAN AND HDF5_BUILD_HL_LIB ) + +#----------------------------------------------------------------------------- # Generate the H5pubconf.h file containing user settings needed by compilation #----------------------------------------------------------------------------- configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY) -- cgit v0.12