 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 @@
++++ hdf5-1.8.12-new/CMakeLists.txt	2015-01-23 17:01:52.195435543 -0700
+@@ -467,6 +467,7 @@
+ # break into groups (from the config/gnu-flags file)
+ #-----------------------------------------------------------------------------
+ IF (NOT MSVC)
++  IF (CMAKE_COMPILER_IS_GNUCC)
+     SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline")
+     # Append warning flags
+     # Don't use the '-Wtraditional' flag, we're way past having K&R C code
+@@ -525,6 +526,7 @@
+ 
+     # Append more extra warning flags that only gcc 4.7+ know about
+     SET (H5_CFLAGS5 "${H5_CFLAGS5} -Wstack-usage=8192 -Wvector-operation-performance -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn")
++  ENDIF (CMAKE_COMPILER_IS_GNUCC)
+ ENDIF (NOT MSVC)
+   
+ #-----------------------------------------------------------------------------
+@@ -664,9 +666,9 @@
  # Parallel IO usage requires MPI to be Linked and Included
  IF (H5_HAVE_PARALLEL)
    SET (LINK_LIBS ${LINK_LIBS} ${MPI_C_LIBRARIES})

 SET (DEFAULT_API_VERSION "v18")
diff -ruN hdf5-1.8.12/config/cmake/ConfigureChecks.cmake hdf5-1.8.12-new/config/cmake/ConfigureChecks.cmake
--- hdf5-1.8.12/config/cmake/ConfigureChecks.cmake	2013-11-21 08:14:03.000000000 -0700
+++ hdf5-1.8.12-new/config/cmake/ConfigureChecks.cmake	2014-06-27 07:48:00.000000000 -0600
@@ -123,6 +123,7 @@
 
 SET (WINDOWS)

-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	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
