diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-07-16 23:43:29 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-07-16 23:43:29 (GMT) |
commit | 1e612c3a46880773d53ad315f3aef2104abb9347 (patch) | |
tree | 1259838b4fe2f3bb8ca78c8f0b4dea00557c89d1 /config/cmake/ConfigureChecks.cmake | |
parent | 5e94d0336fa7a0ebc0a25d002b413221284691b6 (diff) | |
parent | 75f4e51a1a076ea2f1602619e2a7d7bcce13c2f1 (diff) | |
download | hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.zip hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.tar.gz hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.tar.bz2 |
[svn-r22584] merge from trunk and resolve type ID registration
Diffstat (limited to 'config/cmake/ConfigureChecks.cmake')
-rw-r--r-- | config/cmake/ConfigureChecks.cmake | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index d29b482..33aaf3f 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -121,12 +121,13 @@ IF (WIN32) IF (MINGW) SET (H5_HAVE_MINGW 1) SET (WINDOWS 1) # MinGW tries to imitate Windows + SET (CMAKE_REQUIRED_FLAGS "-DWIN32_LEAN_AND_MEAN=1 -DNOGDI=1") ENDIF (MINGW) SET (H5_HAVE_WIN32_API 1) SET (CMAKE_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib") - SET (CMAKE_REQUIRED_FLAGS "/DWIN32_LEAN_AND_MEAN=1 /DNOGDI=1") IF (NOT UNIX AND NOT CYGWIN AND NOT MINGW) SET (WINDOWS 1) + SET (CMAKE_REQUIRED_FLAGS "/DWIN32_LEAN_AND_MEAN=1 /DNOGDI=1") IF (MSVC) SET (H5_HAVE_VISUAL_STUDIO 1) ENDIF (MSVC) @@ -173,7 +174,9 @@ IF (WINDOWS) SET (H5_HAVE_TIMEZONE 1) SET (H5_HAVE_GETTIMEOFDAY 1) SET (H5_LONE_COLON 0) - + IF (MINGW) + SET (H5_HAVE_WINSOCK2_H 1) + ENDIF (MINGW) SET (H5_HAVE_LIBWS2_32 1) SET (H5_HAVE_LIBWSOCK32 1) ENDIF (WINDOWS) @@ -218,7 +221,9 @@ IF (WINDOWS) SET (USE_INCLUDES ${USE_INCLUDES} "windows.h") ENDIF (WINDOWS) -TEST_BIG_ENDIAN(H5_WORDS_BIGENDIAN) +IF (NOT WINDOWS) + TEST_BIG_ENDIAN(H5_WORDS_BIGENDIAN) +ENDIF (NOT WINDOWS) # For other specific tests, use this MACRO. MACRO (HDF5_FUNCTION_TEST OTHER_TEST) @@ -457,7 +462,7 @@ ADD_DEFINITIONS (${HDF5_EXTRA_FLAGS}) #----------------------------------------------------------------------------- # Check for HAVE_OFF64_T functionality #----------------------------------------------------------------------------- -IF (NOT WINDOWS) +IF (NOT WINDOWS OR MINGW) HDF5_FUNCTION_TEST (HAVE_OFF64_T) IF (H5_HAVE_OFF64_T) CHECK_FUNCTION_EXISTS (lseek64 H5_HAVE_LSEEK64) @@ -474,7 +479,7 @@ IF (NOT WINDOWS) CHECK_FUNCTION_EXISTS (fstat64 H5_HAVE_FSTAT64) CHECK_FUNCTION_EXISTS (stat64 H5_HAVE_STAT64) ENDIF (HAVE_STAT64_STRUCT) -ENDIF (NOT WINDOWS) +ENDIF (NOT WINDOWS OR MINGW) #----------------------------------------------------------------------------- # Check the size in bytes of all the int and float types |