diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-09-23 22:09:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-09-23 22:09:30 (GMT) |
| commit | c19d87b1fc55a3c89bbcea6d940e4b50a4961ef4 (patch) | |
| tree | 30b584d3079170113b30cfc753a8a91cef4cce5b /config | |
| parent | b52c12bc1dbada52a1272ecd5949372ae1dbe6f8 (diff) | |
| download | hdf5-c19d87b1fc55a3c89bbcea6d940e4b50a4961ef4.zip hdf5-c19d87b1fc55a3c89bbcea6d940e4b50a4961ef4.tar.gz hdf5-c19d87b1fc55a3c89bbcea6d940e4b50a4961ef4.tar.bz2 | |
[svn-r24192] Correct test and usage of defines for cmake configure
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 6 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 98ecdaa..769483e 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -1071,7 +1071,11 @@ H5ConversionTests (H5_ULONG_TO_FLOAT_ACCURATE "Checking IF accurately converting # 64-bit machines, where the short program below tests if round-up is # correctly handled. # -H5ConversionTests (H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE "Checking IF accurately converting unsigned long long to floating-point values") +IF (CMAKE_SYSTEM MATCHES "solaris2.*") + H5ConversionTests (H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE "Checking IF accurately converting unsigned long long to floating-point values") +ELSE (CMAKE_SYSTEM MATCHES "solaris2.*") + SET(H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE 1) +ENDIF (CMAKE_SYSTEM MATCHES "solaris2.*") # ---------------------------------------------------------------------- # Set the flag to indicate that the machine can accurately convert # 'float' or 'double' to 'unsigned long long' values. diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 9d86931..bef9d77 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -708,7 +708,7 @@ #cmakedefine H5_SIZEOF_UNSIGNED @H5_SIZEOF_UNSIGNED@ /* The size of `__int64', as computed by sizeof. */ -#cmakedefine H5_SIZEOF___INT64 @H5_SIZEOF___INT64@ +#define H5_SIZEOF___INT64 @H5_SIZEOF___INT64@ /* Define to 1 if you have the ANSI C header files. */ #cmakedefine H5_STDC_HEADERS @H5_STDC_HEADERS@ |