diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-07-30 22:10:00 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-07-30 22:10:00 (GMT) |
| commit | 496372dc18b6cf649c3eb158fefd8ef4d83c2355 (patch) | |
| tree | 64590b59dea95e8c214ddf8d82c0758fc4b1243b /config | |
| parent | 323635f2b57e32db00c5ba27ebb8ef40f2dc5894 (diff) | |
| download | hdf5-496372dc18b6cf649c3eb158fefd8ef4d83c2355.zip hdf5-496372dc18b6cf649c3eb158fefd8ef4d83c2355.tar.gz hdf5-496372dc18b6cf649c3eb158fefd8ef4d83c2355.tar.bz2 | |
HDFFV-10508 more config fixes
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 3 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 4 | ||||
| -rw-r--r-- | config/cmake/HDF5UseFortran.cmake | 2 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFUseCXX.cmake | 6 |
4 files changed, 9 insertions, 6 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index a5444ef..6d1e3ce 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -176,6 +176,9 @@ else () endif () CHECK_TYPE_SIZE("_Quad" ${HDF_PREFIX}_SIZEOF__QUAD) +if (NOT ${${HDF_PREFIX}_SIZEOF__QUAD}) + set (${HDF_PREFIX}_SIZEOF__QUAD 0) +endif () #----------------------------------------------------------------------------- # Macro to determine the various conversion capabilities diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 6908977..ccfe581 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -30,7 +30,7 @@ #cmakedefine H5_AC_APPLE_UNIVERSAL_BUILD @H5_AC_APPLE_UNIVERSAL_BUILD@ /* Define if C++ compiler recognizes offsetof */ -#cmakedefine H5_CXX_HAVE_OFFSETOF @H5_CXX_HAVE_OFFSETOF@ +#cmakedefine H5_CXX_HAVE_OFFSETOF @CXX_HAVE_OFFSETOF@ /* Define the default plugins path to compile */ #cmakedefine H5_DEFAULT_PLUGINDIR "@H5_DEFAULT_PLUGINDIR@" @@ -402,7 +402,7 @@ /* Define to 1 if you have the `tmpfile' function. */ #cmakedefine H5_HAVE_TMPFILE @H5_HAVE_TMPFILE@ -/* Define if tm_gmtoff is a member of `struct tm' */ +/* Define if tm_gmtoff is a member of struct tm */ #cmakedefine H5_HAVE_TM_GMTOFF @H5_HAVE_TM_GMTOFF@ /* Define to 1 if you have the <unistd.h> header file. */ diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake index c7f4f8b..1f66bad 100644 --- a/config/cmake/HDF5UseFortran.cmake +++ b/config/cmake/HDF5UseFortran.cmake @@ -460,7 +460,7 @@ string (REGEX REPLACE "\n" ";" PROG_OUTPUT "${PROG_OUTPUT}") list (GET PROG_OUTPUT 0 LDBL_DIG) list (GET PROG_OUTPUT 1 FLT128_DIG) -if (SIZEOF___FLOAT128 EQUAL 0 OR FLT128_DIG EQUAL 0) +if (${HDF_PREFIX}_SIZEOF___FLOAT128 EQUAL 0 OR FLT128_DIG EQUAL 0) set (${HDF_PREFIX}_HAVE_FLOAT128 0) set (${HDF_PREFIX}_SIZEOF___FLOAT128 0) set (${HDF_PREFIX}_PAC_C_MAX_REAL_PRECISION ${LDBL_DIG}) diff --git a/config/cmake_ext_mod/HDFUseCXX.cmake b/config/cmake_ext_mod/HDFUseCXX.cmake index 3afcdb6..f293ec5 100644 --- a/config/cmake_ext_mod/HDFUseCXX.cmake +++ b/config/cmake_ext_mod/HDFUseCXX.cmake @@ -98,11 +98,11 @@ endmacro () if (CMAKE_CXX_COMPILER_LOADED) foreach (test OLD_HEADER_FILENAME - ${HDF_PREFIX}_NO_NAMESPACE - ${HDF_PREFIX}_NO_STD + HDF_NO_NAMESPACE + HDF_NO_STD BOOL_NOTDEFINED NO_STATIC_CAST - ${HDF_PREFIX}_CXX_HAVE_OFFSETOF + CXX_HAVE_OFFSETOF ) HDF_CXX_FUNCTION_TEST (${test}) endforeach () |