summaryrefslogtreecommitdiffstats
path: root/config/cmake/ConfigureChecks.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-06-08 16:00:58 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-06-08 16:00:58 (GMT)
commitdde94c349e8653028631f92ed06c40772c7876cc (patch)
tree6beb2e213ea79758060d22dcd373eb2837c66414 /config/cmake/ConfigureChecks.cmake
parent0820bef83e258c42294583e140e59f0637a77694 (diff)
downloadhdf5-dde94c349e8653028631f92ed06c40772c7876cc.zip
hdf5-dde94c349e8653028631f92ed06c40772c7876cc.tar.gz
hdf5-dde94c349e8653028631f92ed06c40772c7876cc.tar.bz2
[svn-r22447] DAILYTEST-13: Remove check for vsnprintf works in config. Correct HAVE_WINSOCK name.
Tested: windows
Diffstat (limited to 'config/cmake/ConfigureChecks.cmake')
-rw-r--r--config/cmake/ConfigureChecks.cmake36
1 files changed, 11 insertions, 25 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 4a2daf2..0948675 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -153,23 +153,16 @@ IF (WINDOWS)
# that is, "drive-letter:\" (e.g. "C:") or "drive-letter:/" (e.g. "C:/").
# (This flag should be _unset_ for all machines, except for Windows)
SET (H5_HAVE_WINDOW_PATH 1)
-# SET (LINK_LIBS ${LINK_LIBS} "kernel32")
ENDIF (WINDOWS)
IF (WINDOWS)
- SET (H5_HAVE_IO_H 1)
- SET (H5_HAVE_SETJMP_H 1)
SET (H5_HAVE_STDDEF_H 1)
SET (H5_HAVE_SYS_STAT_H 1)
- SET (H5_HAVE_SYS_TIMEB_H 1)
SET (H5_HAVE_SYS_TYPES_H 1)
- SET (H5_HAVE_WINSOCK_H 1)
SET (H5_HAVE_LIBM 1)
SET (H5_HAVE_STRDUP 1)
SET (H5_HAVE_SYSTEM 1)
- SET (H5_HAVE_DIFFTIME 1)
SET (H5_HAVE_LONGJMP 1)
- SET (H5_STDC_HEADERS 1)
IF (NOT MINGW)
SET (H5_HAVE_GETHOSTNAME 1)
ENDIF (NOT MINGW)
@@ -189,9 +182,7 @@ ENDIF (WINDOWS)
# something not quite correct with the actual test implementation. This affects
# the 'dt_arith' test and most likely lots of other code
# ----------------------------------------------------------------------------
-IF (WINDOWS)
- SET (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "")
-ENDIF (WINDOWS)
+SET (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "")
# ----------------------------------------------------------------------
# END of WINDOWS Hard code Values
@@ -283,9 +274,7 @@ ENDMACRO (HDF5_FUNCTION_TEST)
#-----------------------------------------------------------------------------
# Check for these functions before the time headers are checked
#-----------------------------------------------------------------------------
-IF (NOT WINDOWS)
- HDF5_FUNCTION_TEST (STDC_HEADERS)
-ENDIF (NOT WINDOWS)
+HDF5_FUNCTION_TEST (STDC_HEADERS)
CHECK_FUNCTION_EXISTS (difftime H5_HAVE_DIFFTIME)
#CHECK_FUNCTION_EXISTS (gettimeofday H5_HAVE_GETTIMEOFDAY)
@@ -590,16 +579,13 @@ IF (NOT WINDOWS)
# Does the struct stat have the st_blocks field? This field is not Posix.
#
HDF5_FUNCTION_TEST (HAVE_STAT_ST_BLOCKS)
-
-ENDIF (NOT WINDOWS)
-# ----------------------------------------------------------------------
-# How do we figure out the width of a tty in characters?
-#
-CHECK_FUNCTION_EXISTS (ioctl H5_HAVE_IOCTL)
-HDF5_FUNCTION_TEST (HAVE_STRUCT_VIDEOCONFIG)
-HDF5_FUNCTION_TEST (HAVE_STRUCT_TEXT_INFO)
-IF (NOT WINDOWS)
+ # ----------------------------------------------------------------------
+ # How do we figure out the width of a tty in characters?
+ #
+ CHECK_FUNCTION_EXISTS (ioctl H5_HAVE_IOCTL)
+ HDF5_FUNCTION_TEST (HAVE_STRUCT_VIDEOCONFIG)
+ HDF5_FUNCTION_TEST (HAVE_STRUCT_TEXT_INFO)
CHECK_FUNCTION_EXISTS (_getvideoconfig H5_HAVE__GETVIDEOCONFIG)
CHECK_FUNCTION_EXISTS (gettextinfo H5_HAVE_GETTEXTINFO)
CHECK_FUNCTION_EXISTS (_scrsize H5_HAVE__SCRSIZE)
@@ -645,9 +631,9 @@ CHECK_FUNCTION_EXISTS (vasprintf H5_HAVE_VASPRINTF)
CHECK_FUNCTION_EXISTS (waitpid H5_HAVE_WAITPID)
CHECK_FUNCTION_EXISTS (vsnprintf H5_HAVE_VSNPRINTF)
-IF (H5_HAVE_VSNPRINTF)
- HDF5_FUNCTION_TEST (VSNPRINTF_WORKS)
-ENDIF (H5_HAVE_VSNPRINTF)
+#IF (H5_HAVE_VSNPRINTF)
+# HDF5_FUNCTION_TEST (VSNPRINTF_WORKS)
+#ENDIF (H5_HAVE_VSNPRINTF)
#-----------------------------------------------------------------------------
# sigsetjmp is special; may actually be a macro