 -endforeach()
 diff -ruN hdf5-1.8.12/fortran/src/CMakeLists.txt hdf5-1.8.12-new/fortran/src/CMakeLists.txt
 --- hdf5-1.8.12/fortran/src/CMakeLists.txt	2013-11-21 08:14:04.000000000 -0700
-+++ hdf5-1.8.12-new/fortran/src/CMakeLists.txt	2014-06-27 07:50:05.000000000 -0600
++++ hdf5-1.8.12-new/fortran/src/CMakeLists.txt	2015-01-23 15:28:41.344642553 -0700
 @@ -117,6 +117,11 @@
      ${HDF5_F90_SRC_SOURCE_DIR}/H5Tf.c
      ${HDF5_F90_SRC_SOURCE_DIR}/H5Zf.c

diff -ruN hdf5-1.8.12/CMakeLists.txt hdf5-1.8.12-new/CMakeLists.txt
--- hdf5-1.8.12/CMakeLists.txt	2013-11-21 08:14:04.000000000 -0700
+++ hdf5-1.8.12-new/CMakeLists.txt	2014-06-27 07:43:36.000000000 -0600
@@ -664,9 +664,9 @@
 # Parallel IO usage requires MPI to be Linked and Included
 IF (H5_HAVE_PARALLEL)
   SET (LINK_LIBS ${LINK_LIBS} ${MPI_C_LIBRARIES})

   IF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
     SET (H5_HAVE_GETCONSOLESCREENBUFFERINFO 1)
   ENDIF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
@@ -216,12 +219,22 @@
 IF (NOT WINDOWS)
   CHECK_LIBRARY_EXISTS_CONCAT ("m" ceil     H5_HAVE_LIBM)
   CHECK_LIBRARY_EXISTS_CONCAT ("dl" dlopen     H5_HAVE_LIBDL)
-  CHECK_LIBRARY_EXISTS_CONCAT ("ws2_32" WSAStartup  H5_HAVE_LIBWS2_32)
-  CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" gethostbyname H5_HAVE_LIBWSOCK32)
+  if (NOT ${CMAKE_C_COMPILER} MATCHES "mpiicc")
+    CHECK_LIBRARY_EXISTS_CONCAT ("ws2_32" WSAStartup  H5_HAVE_LIBWS2_32)
+    CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" gethostbyname H5_HAVE_LIBWSOCK32)
+  else()
+    SET (H5_HAVE_LIBWS2_32:INTERNAL 0)
+      SET (H5_HAVE_LIBWSOCK32:INTERNAL 0)
+  endif()
 ENDIF (NOT WINDOWS)
 
-CHECK_LIBRARY_EXISTS_CONCAT ("ucb"    gethostname  H5_HAVE_LIBUCB)
-CHECK_LIBRARY_EXISTS_CONCAT ("socket" connect      H5_HAVE_LIBSOCKET)
+if (NOT ${CMAKE_C_COMPILER} MATCHES "mpiicc" AND NOT WINDOWS)
+  CHECK_LIBRARY_EXISTS_CONCAT ("ucb"    gethostname  H5_HAVE_LIBUCB)
+  CHECK_LIBRARY_EXISTS_CONCAT ("socket" connect      H5_HAVE_LIBSOCKET)
+  else()
+    SET (H5_HAVE_LIBUCB:INTERNAL 0)
+      SET (H5_HAVE_LIBSOCKET:INTERNAL 0)
+endif()
 CHECK_LIBRARY_EXISTS ("c" gethostbyname "" NOT_NEED_LIBNSL)
 
 IF (NOT NOT_NEED_LIBNSL)
@@ -623,7 +636,11 @@
   CHECK_FUNCTION_EXISTS (gettextinfo       H5_HAVE_GETTEXTINFO)
   CHECK_FUNCTION_EXISTS (_scrsize          H5_HAVE__SCRSIZE)
   IF (NOT CYGWIN AND NOT MINGW)
-    CHECK_FUNCTION_EXISTS (GetConsoleScreenBufferInfo    H5_HAVE_GETCONSOLESCREENBUFFERINFO)
+    IF (NOT ${CMAKE_C_COMPILER} MATCHES "mpiicc")
+      CHECK_FUNCTION_EXISTS (GetConsoleScreenBufferInfo    H5_HAVE_GETCONSOLESCREENBUFFERINFO)
+    ELSE ()
+      set(H5_HAVE_GETCONSOLESCREENBUFFERINFO:INTERNAL 0)
+    ENDIF ()
   ENDIF (NOT CYGWIN AND NOT MINGW)
   CHECK_SYMBOL_EXISTS (TIOCGWINSZ "sys/ioctl.h" H5_HAVE_TIOCGWINSZ)
   CHECK_SYMBOL_EXISTS (TIOCGETD   "sys/ioctl.h" H5_HAVE_TIOCGETD)
@@ -638,7 +655,11 @@
 CHECK_FUNCTION_EXISTS (frexpf            H5_HAVE_FREXPF)
 CHECK_FUNCTION_EXISTS (frexpl            H5_HAVE_FREXPL)
 
-CHECK_FUNCTION_EXISTS (gethostname       H5_HAVE_GETHOSTNAME)
+IF (NOT MINGW)
+  CHECK_FUNCTION_EXISTS (gethostname       H5_HAVE_GETHOSTNAME)
+ELSE ()
+  set(H5_HAVE_GETHOSTNAME:INTERNAL 0)
+ENDIF ()
 CHECK_FUNCTION_EXISTS (getpwuid          H5_HAVE_GETPWUID)
 CHECK_FUNCTION_EXISTS (getrusage         H5_HAVE_GETRUSAGE)
