summaryrefslogtreecommitdiffstats
path: root/config/cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-06-18 17:29:44 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-06-18 17:29:44 (GMT)
commit79b36622aacb480870340e494a62de8315f8662d (patch)
tree197f334128b669d595621cd673ea354777c26ff4 /config/cmake
parent603fc9dbe09270f3686d776ef6f8243c9954cddc (diff)
downloadhdf5-79b36622aacb480870340e494a62de8315f8662d.zip
hdf5-79b36622aacb480870340e494a62de8315f8662d.tar.gz
hdf5-79b36622aacb480870340e494a62de8315f8662d.tar.bz2
[svn-r22469] MinGW Flags need to use dash
set WINSOCK2_H do not test for endianess Tested: windows 32 minGW
Diffstat (limited to 'config/cmake')
-rw-r--r--config/cmake/ConfigureChecks.cmake11
1 files changed, 8 insertions, 3 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 6fb9ec1..2b64a56 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)
@@ -172,7 +173,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)
@@ -217,7 +220,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)