diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-06-23 20:56:24 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-06-23 20:56:24 (GMT) |
| commit | 0e907c2d10514a88d3e807237085a3f0bcd68f46 (patch) | |
| tree | c081691323b94366b2fb89c39ecffed6ac3fbef5 | |
| parent | 4df63636e3f25047798030545ab65fa0f91e81be (diff) | |
| download | hdf5-0e907c2d10514a88d3e807237085a3f0bcd68f46.zip hdf5-0e907c2d10514a88d3e807237085a3f0bcd68f46.tar.gz hdf5-0e907c2d10514a88d3e807237085a3f0bcd68f46.tar.bz2 | |
[svn-r21026] Add configure check for endianess and adjust test depending on status of check
Tested: heiwa
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 2 | ||||
| -rw-r--r-- | tools/h5ls/CMakeLists.txt | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index db6b3b4..1c6c8e4 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -10,6 +10,7 @@ INCLUDE (${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake) INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake) INCLUDE (${CMAKE_ROOT}/Modules/CheckVariableExists.cmake) INCLUDE (${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake) +INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake) #----------------------------------------------------------------------------- # Always SET this for now IF we are on an OS X box @@ -222,6 +223,9 @@ SET (USE_INCLUDES "") IF (WINDOWS) SET (USE_INCLUDES ${USE_INCLUDES} "windows.h") ENDIF (WINDOWS) + +TEST_BIG_ENDIAN(H5_WORDS_BIGENDIAN) + #----------------------------------------------------------------------------- # Check IF header file exists and add it to the list. #----------------------------------------------------------------------------- diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 956a8cb..8b8bf30 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -759,6 +759,8 @@ # endif #endif +#cmakedefine WORDS_BIGENDIAN @H5_WORDS_BIGENDIANR@ + /* Number of bits in a file offset, on hosts where this is settable. */ #cmakedefine _FILE_OFFSET_BITS diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt index ec137f0..2cd11cd 100644 --- a/tools/h5ls/CMakeLists.txt +++ b/tools/h5ls/CMakeLists.txt @@ -397,15 +397,15 @@ IF (BUILD_TESTING) # test for non-existing file ADD_H5_TEST (nosuchfile 1 nosuchfile.h5) - IF (WORDS_BIGENDIAN) + IF (H5_WORDS_BIGENDIAN) # test for variable length data types in verbose mode ADD_H5_TEST (tvldtypes2be 0 -v tvldtypes1.h5) # test for dataset region references data types in verbose mode ADD_H5_TEST (tdataregbe 0 -v tdatareg.h5) - ELSE (WORDS_BIGENDIAN) + ELSE (H5_WORDS_BIGENDIAN) ADD_H5_TEST (tvldtypes2le 0 -v tvldtypes1.h5) ADD_H5_TEST (tdataregle 0 -v tdatareg.h5) - ENDIF (WORDS_BIGENDIAN) + ENDIF (H5_WORDS_BIGENDIAN) ENDIF (BUILD_TESTING) |