[svn-r24942] merge from VOL branch.

32 files changed, 1408 insertions, 1418 deletions

diff --git a/config/Makefile.am.blank b/config/Makefile.am.blank
index 05799fc..a54c734 100644
--- a/config/Makefile.am.blank
+++ b/config/Makefile.am.blank
@@ -40,7 +40,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Add include directories to the C preprocessor flags
-INCLUDES=-I$(top_srcdir)/src
+AM_CPPFLAGS+=-I$(top_srcdir)/src
 
 # Our main targets, the library foo.la and the programs bar and baz
 lib_LTLIBRARIES=foo.la
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index cb32827..6d3f0ee 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -1,6 +1,6 @@
-SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 3000)
+set (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 3000)
  
-SET (CTEST_CUSTOM_WARNING_EXCEPTION
+set (CTEST_CUSTOM_WARNING_EXCEPTION
     ${CTEST_CUSTOM_WARNING_EXCEPTION}
 #    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090:"
 #    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning:[ \t]*passing argument"
@@ -17,7 +17,7 @@ SET (CTEST_CUSTOM_WARNING_EXCEPTION
 #    "fpp:[ \t]*warning:[ \t]*cannot remove H5_DEBUG_API - not a predefined macro"
 )
  
-SET (CTEST_CUSTOM_MEMCHECK_IGNORE
+set (CTEST_CUSTOM_MEMCHECK_IGNORE
     ${CTEST_CUSTOM_MEMCHECK_IGNORE}
     flush1           #designed to fail
     flush2           #designed to need flush1
diff --git a/config/cmake/CheckTypeSize.cmake b/config/cmake/CheckTypeSize.cmake
index eca6e76..4af5741 100644
--- a/config/cmake/CheckTypeSize.cmake
+++ b/config/cmake/CheckTypeSize.cmake
@@ -8,23 +8,23 @@
 #
 
 MACRO (HDF_CHECK_TYPE_SIZE TYPE VARIABLE)
-  SET (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
-  IF ("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-    SET (MACRO_CHECK_TYPE_SIZE_FLAGS 
+  set (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
+  if ("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    set (MACRO_CHECK_TYPE_SIZE_FLAGS 
         "-DCHECK_TYPE_SIZE_TYPE=\"${TYPE}\" ${CMAKE_REQUIRED_FLAGS}"
     )
-    FOREACH (def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H HAVE_INTTYPES_H)
-      IF ("${def}")
-        SET (MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
+    foreach (def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H HAVE_INTTYPES_H)
+      if ("${def}")
+        set (MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
       ENDIF("${def}")
-    ENDFOREACH (def)
+    endforeach (def)
 
-    MESSAGE (STATUS "Check size of ${TYPE}")
-    IF (CMAKE_REQUIRED_LIBRARIES)
-      SET (CHECK_TYPE_SIZE_ADD_LIBRARIES 
+    message (STATUS "Check size of ${TYPE}")
+    if (CMAKE_REQUIRED_LIBRARIES)
+      set (CHECK_TYPE_SIZE_ADD_LIBRARIES 
           "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
       )
-    ENDIF (CMAKE_REQUIRED_LIBRARIES)
+    endif (CMAKE_REQUIRED_LIBRARIES)
     TRY_RUN (${VARIABLE} HAVE_${VARIABLE}
         ${CMAKE_BINARY_DIR}
         ${HDF5_RESOURCES_DIR}/CheckTypeSize.c
@@ -32,17 +32,17 @@ MACRO (HDF_CHECK_TYPE_SIZE TYPE VARIABLE)
         "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
         OUTPUT_VARIABLE OUTPUT
     )
-    IF (HAVE_${VARIABLE})
-      MESSAGE (STATUS "Check size of ${TYPE} - done")
-      FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log 
+    if (HAVE_${VARIABLE})
+      message (STATUS "Check size of ${TYPE} - done")
+      file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log 
           "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n"
       )
-    ELSE (HAVE_${VARIABLE})
-      MESSAGE (STATUS "Check size of ${TYPE} - failed")
-      FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log 
+    else (HAVE_${VARIABLE})
+      message (STATUS "Check size of ${TYPE} - failed")
+      file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log 
           "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n\n"
       )
-    ENDIF (HAVE_${VARIABLE})
-  ENDIF ("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-  SET (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS)
+    endif (HAVE_${VARIABLE})
+  endif ("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+  set (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS)
 ENDMACRO (HDF_CHECK_TYPE_SIZE)
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 2dd6752..0a27f3b 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -1,68 +1,68 @@
 #-----------------------------------------------------------------------------
 # Include all the necessary files for macros
 #-----------------------------------------------------------------------------
-INCLUDE (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckVariableExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake)
+include (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
+include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+include (${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake)
+include (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
+include (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
+include (${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
+include (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
+include (${CMAKE_ROOT}/Modules/CheckVariableExists.cmake)
+include (${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake)
+include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
+include (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake)
 
 #-----------------------------------------------------------------------------
 # APPLE/Darwin setup
 #-----------------------------------------------------------------------------
-IF (APPLE)
-  LIST(LENGTH CMAKE_OSX_ARCHITECTURES ARCH_LENGTH)
-  IF(ARCH_LENGTH GREATER 1)
+if (APPLE)
+  list (LENGTH CMAKE_OSX_ARCHITECTURES ARCH_LENGTH)
+  if (ARCH_LENGTH GREATER 1)
     set (CMAKE_OSX_ARCHITECTURES "" CACHE STRING "" FORCE)
     message(FATAL_ERROR "Building Universal Binaries on OS X is NOT supported by the HDF5 project. This is"
     "due to technical reasons. The best approach would be build each architecture in separate directories"
     "and use the 'lipo' tool to combine them into a single executable or library. The 'CMAKE_OSX_ARCHITECTURES'"
     "variable has been set to a blank value which will build the default architecture for this system.")
-  ENDIF()
-  SET (H5_AC_APPLE_UNIVERSAL_BUILD 0)
-ENDIF (APPLE)
+  endif ()
+  set (H5_AC_APPLE_UNIVERSAL_BUILD 0)
+endif (APPLE)
 
 # Check for Darwin (not just Apple - we also want to catch OpenDarwin)
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 
-    SET (H5_HAVE_DARWIN 1) 
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 
+    set (H5_HAVE_DARWIN 1) 
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 # Check for Solaris
-IF(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") 
-    SET (H5_HAVE_SOLARIS 1) 
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") 
+    set (H5_HAVE_SOLARIS 1) 
+endif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
 
 #-----------------------------------------------------------------------------
 # Option to Clear File Buffers before write --enable-clear-file-buffers
 #-----------------------------------------------------------------------------
-OPTION (HDF5_Enable_Clear_File_Buffers "Securely clear file buffers before writing to file" ON)
-IF (HDF5_Enable_Clear_File_Buffers)
-  SET (H5_CLEAR_MEMORY 1)
-ENDIF (HDF5_Enable_Clear_File_Buffers)
+option (HDF5_Enable_Clear_File_Buffers "Securely clear file buffers before writing to file" ON)
+if (HDF5_Enable_Clear_File_Buffers)
+  set (H5_CLEAR_MEMORY 1)
+endif (HDF5_Enable_Clear_File_Buffers)
 MARK_AS_ADVANCED (HDF5_Enable_Clear_File_Buffers)
 
 #-----------------------------------------------------------------------------
 # Option for --enable-strict-format-checks
 #-----------------------------------------------------------------------------
-OPTION (HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF)
-IF (HDF5_STRICT_FORMAT_CHECKS)
-  SET (H5_STRICT_FORMAT_CHECKS 1)
-ENDIF (HDF5_STRICT_FORMAT_CHECKS)
+option (HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF)
+if (HDF5_STRICT_FORMAT_CHECKS)
+  set (H5_STRICT_FORMAT_CHECKS 1)
+endif (HDF5_STRICT_FORMAT_CHECKS)
 MARK_AS_ADVANCED (HDF5_STRICT_FORMAT_CHECKS)
 
 #-----------------------------------------------------------------------------
 # Option for --enable-metadata-trace-file
 #-----------------------------------------------------------------------------
-OPTION (HDF5_METADATA_TRACE_FILE "Enable metadata trace file collection" OFF)
-IF (HDF5_METADATA_TRACE_FILE)
-  SET (H5_METADATA_TRACE_FILE 1)
-ENDIF (HDF5_METADATA_TRACE_FILE)
+option (HDF5_METADATA_TRACE_FILE "Enable metadata trace file collection" OFF)
+if (HDF5_METADATA_TRACE_FILE)
+  set (H5_METADATA_TRACE_FILE 1)
+endif (HDF5_METADATA_TRACE_FILE)
 MARK_AS_ADVANCED (HDF5_METADATA_TRACE_FILE)
 
 # ----------------------------------------------------------------------
@@ -71,10 +71,10 @@ MARK_AS_ADVANCED (HDF5_METADATA_TRACE_FILE)
 # though the data may be wrong (for example, some compilers don't
 # support denormalized floating values) to maximize speed.
 #
-OPTION (HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" ON)
-IF (HDF5_WANT_DATA_ACCURACY)
-  SET (H5_WANT_DATA_ACCURACY 1)
-ENDIF(HDF5_WANT_DATA_ACCURACY)
+option (HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" ON)
+if (HDF5_WANT_DATA_ACCURACY)
+  set (H5_WANT_DATA_ACCURACY 1)
+endif (HDF5_WANT_DATA_ACCURACY)
 MARK_AS_ADVANCED (HDF5_WANT_DATA_ACCURACY)
 
 # ----------------------------------------------------------------------
@@ -83,200 +83,193 @@ MARK_AS_ADVANCED (HDF5_WANT_DATA_ACCURACY)
 # for the speed optimization of hard conversions.  Soft conversions can
 # actually benefit little.
 #
-OPTION (HDF5_WANT_DCONV_EXCEPTION "exception handling functions is checked during data conversions" ON)
-IF (HDF5_WANT_DCONV_EXCEPTION)
-  SET (H5_WANT_DCONV_EXCEPTION 1)
-ENDIF (HDF5_WANT_DCONV_EXCEPTION)
+option (HDF5_WANT_DCONV_EXCEPTION "exception handling functions is checked during data conversions" ON)
+if (HDF5_WANT_DCONV_EXCEPTION)
+  set (H5_WANT_DCONV_EXCEPTION 1)
+endif (HDF5_WANT_DCONV_EXCEPTION)
 MARK_AS_ADVANCED (HDF5_WANT_DCONV_EXCEPTION)
 
 # ----------------------------------------------------------------------
 # Check if they would like the function stack support compiled in
 #
-OPTION (HDF5_ENABLE_CODESTACK "Enable the function stack tracing (for developer debugging)." OFF)
-IF (HDF5_ENABLE_CODESTACK)
-  SET (H5_HAVE_CODESTACK 1)
-ENDIF (HDF5_ENABLE_CODESTACK)
+option (HDF5_ENABLE_CODESTACK "Enable the function stack tracing (for developer debugging)." OFF)
+if (HDF5_ENABLE_CODESTACK)
+  set (H5_HAVE_CODESTACK 1)
+endif (HDF5_ENABLE_CODESTACK)
 MARK_AS_ADVANCED (HDF5_ENABLE_CODESTACK)
 
-OPTION (HDF5_ENABLE_HSIZET "Enable datasets larger than memory" ON)
+option (HDF5_ENABLE_HSIZET "Enable datasets larger than memory" ON)
 
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can handle converting
 # floating-point to long long values.
 # (This flag should be _unset_ for all machines)
 #
-#  SET (H5_HW_FP_TO_LLONG_NOT_WORKS 0)
+#  set (H5_HW_FP_TO_LLONG_NOT_WORKS 0)
 
 # so far we have no check for this
-SET(H5_HAVE_TMPFILE 1)
+set (H5_HAVE_TMPFILE 1)
 
 #-----------------------------------------------------------------------------
 # This MACRO checks IF the symbol exists in the library and IF it
 # does, it appends library to the list.
 #-----------------------------------------------------------------------------
-SET (LINK_LIBS "")
+set (LINK_LIBS "")
 MACRO (CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE)
   CHECK_LIBRARY_EXISTS ("${LIBRARY};${LINK_LIBS}" ${SYMBOL} "" ${VARIABLE})
-  IF (${VARIABLE})
-    SET (LINK_LIBS ${LINK_LIBS} ${LIBRARY})
-  ENDIF (${VARIABLE})
+  if (${VARIABLE})
+    set (LINK_LIBS ${LINK_LIBS} ${LIBRARY})
+  endif (${VARIABLE})
 ENDMACRO (CHECK_LIBRARY_EXISTS_CONCAT)
 
 # ----------------------------------------------------------------------
 # WINDOWS Hard code Values
 # ----------------------------------------------------------------------
 
-SET (WINDOWS)
-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")
-  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)
-  ENDIF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
-ENDIF (WIN32)
-
-#IF (WIN32)
-#  SET (DEFAULT_STREAM_VFD OFF)
-#ELSE (WIN32)
-#  SET (DEFAULT_STREAM_VFD ON)
-#ENDIF (WIN32)
-#OPTION (HDF5_STREAM_VFD "Compile Stream Virtual File Driver support" ${DEFAULT_STREAM_VFD})
+set (WINDOWS)
+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")
+  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)
+  endif (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
+endif (WIN32)
 
 # TODO --------------------------------------------------------------------------
 # Should the Default Virtual File Driver be compiled?
 # This is hard-coded now but option should added to match configure
 #
-SET (H5_DEFAULT_VFD H5FD_SEC2)
-
-IF (NOT DEFINED "H5_DEFAULT_PLUGINDIR")
-  IF (WINDOWS)
-    SET (H5_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%/hdf5/lib/plugin")
-  ELSE (WINDOWS)
-    SET (H5_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin")
-  ENDIF (WINDOWS)
-ENDIF (NOT DEFINED "H5_DEFAULT_PLUGINDIR")
-
-IF (WINDOWS)
-  SET (H5_HAVE_WINDOWS 1)
+set (H5_DEFAULT_VFD H5FD_SEC2)
+
+if (NOT DEFINED "H5_DEFAULT_PLUGINDIR")
+  if (WINDOWS)
+    set (H5_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%/hdf5/lib/plugin")
+  else (WINDOWS)
+    set (H5_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin")
+  endif (WINDOWS)
+endif (NOT DEFINED "H5_DEFAULT_PLUGINDIR")
+
+if (WINDOWS)
+  set (H5_HAVE_WINDOWS 1)
   # ----------------------------------------------------------------------
   # Set the flag to indicate that the machine has window style pathname,
   # 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)
-ENDIF (WINDOWS)
+  set (H5_HAVE_WINDOW_PATH 1)
+endif (WINDOWS)
 SET (H5_DEFAULT_VOL H5VL_NATIVE)
 
-IF (WINDOWS)
-  SET (H5_HAVE_STDDEF_H 1)
-  SET (H5_HAVE_SYS_STAT_H 1)
-  SET (H5_HAVE_SYS_TYPES_H 1)
-  SET (H5_HAVE_LIBM 1)
-  SET (H5_HAVE_STRDUP 1)
-  SET (H5_HAVE_SYSTEM 1)
-  SET (H5_HAVE_LONGJMP 1)
-  IF (NOT MINGW)
-    SET (H5_HAVE_GETHOSTNAME 1)
-  ENDIF (NOT MINGW)
-  IF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
-    SET (H5_HAVE_GETCONSOLESCREENBUFFERINFO 1)
-  ENDIF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
-  SET (H5_HAVE_FUNCTION 1)
-  SET (H5_GETTIMEOFDAY_GIVES_TZ 1)
-  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)
+if (WINDOWS)
+  set (H5_HAVE_STDDEF_H 1)
+  set (H5_HAVE_SYS_STAT_H 1)
+  set (H5_HAVE_SYS_TYPES_H 1)
+  set (H5_HAVE_LIBM 1)
+  set (H5_HAVE_STRDUP 1)
+  set (H5_HAVE_SYSTEM 1)
+  set (H5_HAVE_LONGJMP 1)
+  if (NOT MINGW)
+    set (H5_HAVE_GETHOSTNAME 1)
+  endif (NOT MINGW)
+  if (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
+    set (H5_HAVE_GETCONSOLESCREENBUFFERINFO 1)
+  endif (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
+  set (H5_HAVE_FUNCTION 1)
+  set (H5_GETTIMEOFDAY_GIVES_TZ 1)
+  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)
 
   #-----------------------------------------------------------------------------
   # These tests need to be manually SET for windows since there is currently
   # something not quite correct with the actual test implementation. This affects
   # the 'dt_arith' test and most likely lots of other code
   # ----------------------------------------------------------------------------
-  SET (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "")
-ENDIF (WINDOWS)
+  set (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "")
+endif (WINDOWS)
 
 # ----------------------------------------------------------------------
 # END of WINDOWS Hard code Values
 # ----------------------------------------------------------------------
 
-IF (CYGWIN)
-  SET (H5_HAVE_LSEEK64 0)
-ENDIF (CYGWIN)
+if (CYGWIN)
+  set (H5_HAVE_LSEEK64 0)
+endif (CYGWIN)
 
 #-----------------------------------------------------------------------------
 #  Check for the math library "m"
 #-----------------------------------------------------------------------------
-IF (NOT WINDOWS)
+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)
-ENDIF (NOT WINDOWS)
+endif (NOT WINDOWS)
 
 CHECK_LIBRARY_EXISTS_CONCAT ("ucb"    gethostname  H5_HAVE_LIBUCB)
 CHECK_LIBRARY_EXISTS_CONCAT ("socket" connect      H5_HAVE_LIBSOCKET)
 CHECK_LIBRARY_EXISTS ("c" gethostbyname "" NOT_NEED_LIBNSL)
 
-IF (NOT NOT_NEED_LIBNSL)
+if (NOT NOT_NEED_LIBNSL)
   CHECK_LIBRARY_EXISTS_CONCAT ("nsl"    gethostbyname  H5_HAVE_LIBNSL)
-ENDIF (NOT NOT_NEED_LIBNSL)
+endif (NOT NOT_NEED_LIBNSL)
 
 # For other tests to use the same libraries
-SET (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LINK_LIBS})
+set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LINK_LIBS})
 
-SET (USE_INCLUDES "")
-IF (WINDOWS)
-  SET (USE_INCLUDES ${USE_INCLUDES} "windows.h")
-ENDIF (WINDOWS)
+set (USE_INCLUDES "")
+if (WINDOWS)
+  set (USE_INCLUDES ${USE_INCLUDES} "windows.h")
+endif (WINDOWS)
 
-IF (NOT WINDOWS)
-  TEST_BIG_ENDIAN(H5_WORDS_BIGENDIAN)
-ENDIF (NOT WINDOWS)
+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)
-  IF ("H5_${OTHER_TEST}" MATCHES "^H5_${OTHER_TEST}$")
-    SET (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
-    SET (OTHER_TEST_ADD_LIBRARIES)
-    IF (CMAKE_REQUIRED_LIBRARIES)
-      SET (OTHER_TEST_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
-    ENDIF (CMAKE_REQUIRED_LIBRARIES)
-
-    FOREACH (def ${HDF5_EXTRA_TEST_DEFINITIONS})
-      SET (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}=${${def}}")
-    ENDFOREACH (def)
-
-    FOREACH (def
+  if ("H5_${OTHER_TEST}" MATCHES "^H5_${OTHER_TEST}$")
+    set (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
+    set (OTHER_TEST_ADD_LIBRARIES)
+    if (CMAKE_REQUIRED_LIBRARIES)
+      set (OTHER_TEST_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+    endif (CMAKE_REQUIRED_LIBRARIES)
+
+    foreach (def ${HDF5_EXTRA_TEST_DEFINITIONS})
+      set (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}=${${def}}")
+    endforeach (def)
+
+    foreach (def
         HAVE_SYS_TIME_H
         HAVE_UNISTD_H
         HAVE_SYS_TYPES_H
         HAVE_SYS_SOCKET_H
     )
-      IF ("${H5_${def}}")
-        SET (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}")
-      ENDIF ("${H5_${def}}")
-    ENDFOREACH (def)
+      if ("${H5_${def}}")
+        set (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}")
+      endif ("${H5_${def}}")
+    endforeach (def)
 
-    IF (LARGEFILE)
-      SET (MACRO_CHECK_FUNCTION_DEFINITIONS
+    if (LARGEFILE)
+      set (MACRO_CHECK_FUNCTION_DEFINITIONS
           "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE"
       )
-    ENDIF (LARGEFILE)
+    endif (LARGEFILE)
 
-    #MESSAGE (STATUS "Performing ${OTHER_TEST}")
+    #message (STATUS "Performing ${OTHER_TEST}")
     TRY_COMPILE (${OTHER_TEST}
         ${CMAKE_BINARY_DIR}
         ${HDF5_RESOURCES_DIR}/HDF5Tests.c
@@ -284,18 +277,18 @@ MACRO (HDF5_FUNCTION_TEST OTHER_TEST)
         "${OTHER_TEST_ADD_LIBRARIES}"
         OUTPUT_VARIABLE OUTPUT
     )
-    IF (${OTHER_TEST})
-      SET (H5_${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
-      MESSAGE (STATUS "Performing Other Test ${OTHER_TEST} - Success")
-    ELSE (${OTHER_TEST})
-      MESSAGE (STATUS "Performing Other Test ${OTHER_TEST} - Failed")
-      SET (H5_${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
-      FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+    if (${OTHER_TEST})
+      set (H5_${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
+      message (STATUS "Performing Other Test ${OTHER_TEST} - Success")
+    else (${OTHER_TEST})
+      message (STATUS "Performing Other Test ${OTHER_TEST} - Failed")
+      set (H5_${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
+      file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Performing Other Test ${OTHER_TEST} failed with the following output:\n"
           "${OUTPUT}\n"
       )
-    ENDIF (${OTHER_TEST})
-  ENDIF ("H5_${OTHER_TEST}" MATCHES "^H5_${OTHER_TEST}$")
+    endif (${OTHER_TEST})
+  endif ("H5_${OTHER_TEST}" MATCHES "^H5_${OTHER_TEST}$")
 ENDMACRO (HDF5_FUNCTION_TEST)
 
 #-----------------------------------------------------------------------------
@@ -307,58 +300,58 @@ CHECK_FUNCTION_EXISTS (difftime          H5_HAVE_DIFFTIME)
 #CHECK_FUNCTION_EXISTS (gettimeofday      H5_HAVE_GETTIMEOFDAY)
 #  Since gettimeofday is not defined any where standard, lets look in all the
 #  usual places. On MSVC we are just going to use ::clock()
-IF (NOT MSVC)
-  IF ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$")
+if (NOT MSVC)
+  if ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$")
     TRY_COMPILE (HAVE_TIME_GETTIMEOFDAY
         ${CMAKE_BINARY_DIR}
         ${HDF5_RESOURCES_DIR}/GetTimeOfDayTest.cpp
         COMPILE_DEFINITIONS -DTRY_TIME_H
         OUTPUT_VARIABLE OUTPUT
     )
-    IF (HAVE_TIME_GETTIMEOFDAY STREQUAL "TRUE")
-      SET (H5_HAVE_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_TIME_GETTIMEOFDAY")
-      SET (H5_HAVE_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_GETTIMEOFDAY")
-    ENDIF (HAVE_TIME_GETTIMEOFDAY STREQUAL "TRUE")
-  ENDIF ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$")
+    if (HAVE_TIME_GETTIMEOFDAY STREQUAL "TRUE")
+      set (H5_HAVE_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_TIME_GETTIMEOFDAY")
+      set (H5_HAVE_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_GETTIMEOFDAY")
+    endif (HAVE_TIME_GETTIMEOFDAY STREQUAL "TRUE")
+  endif ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$")
 
-  IF ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$")
+  if ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$")
     TRY_COMPILE (HAVE_SYS_TIME_GETTIMEOFDAY
         ${CMAKE_BINARY_DIR}
         ${HDF5_RESOURCES_DIR}/GetTimeOfDayTest.cpp
         COMPILE_DEFINITIONS -DTRY_SYS_TIME_H
         OUTPUT_VARIABLE OUTPUT
     )
-    IF (HAVE_SYS_TIME_GETTIMEOFDAY STREQUAL "TRUE")
-      SET (H5_HAVE_SYS_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_SYS_TIME_GETTIMEOFDAY")
-      SET (H5_HAVE_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_GETTIMEOFDAY")
-    ENDIF (HAVE_SYS_TIME_GETTIMEOFDAY STREQUAL "TRUE")
-  ENDIF ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$")
-
-  IF (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY)
-    MESSAGE (STATUS "---------------------------------------------------------------")
-    MESSAGE (STATUS "Function 'gettimeofday()' was not found. HDF5 will use its")
-    MESSAGE (STATUS "  own implementation.. This can happen on older versions of")
-    MESSAGE (STATUS "  MinGW on Windows. Consider upgrading your MinGW installation")
-    MESSAGE (STATUS "  to a newer version such as MinGW 3.12")
-    MESSAGE (STATUS "---------------------------------------------------------------")
-  ENDIF (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY)
-ENDIF (NOT MSVC)
+    if (HAVE_SYS_TIME_GETTIMEOFDAY STREQUAL "TRUE")
+      set (H5_HAVE_SYS_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_SYS_TIME_GETTIMEOFDAY")
+      set (H5_HAVE_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_GETTIMEOFDAY")
+    endif (HAVE_SYS_TIME_GETTIMEOFDAY STREQUAL "TRUE")
+  endif ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$")
+
+  if (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY)
+    message (STATUS "---------------------------------------------------------------")
+    message (STATUS "Function 'gettimeofday()' was not found. HDF5 will use its")
+    message (STATUS "  own implementation.. This can happen on older versions of")
+    message (STATUS "  MinGW on Windows. Consider upgrading your MinGW installation")
+    message (STATUS "  to a newer version such as MinGW 3.12")
+    message (STATUS "---------------------------------------------------------------")
+  endif (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY)
+endif (NOT MSVC)
 
 # Find the library containing clock_gettime()
-IF (NOT WINDOWS)
+if (NOT WINDOWS)
   CHECK_FUNCTION_EXISTS(clock_gettime CLOCK_GETTIME_IN_LIBC)
   CHECK_LIBRARY_EXISTS(rt clock_gettime "" CLOCK_GETTIME_IN_LIBRT)
   CHECK_LIBRARY_EXISTS(posix4 clock_gettime "" CLOCK_GETTIME_IN_LIBPOSIX4)
-  IF(CLOCK_GETTIME_IN_LIBC)
-    SET(H5_HAVE_CLOCK_GETTIME 1)
-  ELSEIF(CLOCK_GETTIME_IN_LIBRT)
-    SET(H5_HAVE_CLOCK_GETTIME 1)
-    LIST(APPEND LINK_LIBS rt)
-  ELSEIF(CLOCK_GETTIME_IN_LIBPOSIX4)
-    SET(H5_HAVE_CLOCK_GETTIME 1)
-    LIST(APPEND LINK_LIBS posix4)
-  ENDIF(CLOCK_GETTIME_IN_LIBC)
-ENDIF (NOT WINDOWS)
+  if (CLOCK_GETTIME_IN_LIBC)
+    set (H5_HAVE_CLOCK_GETTIME 1)
+  elseif (CLOCK_GETTIME_IN_LIBRT)
+    set (H5_HAVE_CLOCK_GETTIME 1)
+    list (APPEND LINK_LIBS rt)
+  elseif (CLOCK_GETTIME_IN_LIBPOSIX4)
+    set (H5_HAVE_CLOCK_GETTIME 1)
+    list (APPEND LINK_LIBS posix4)
+  endif (CLOCK_GETTIME_IN_LIBC)
+endif (NOT WINDOWS)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -366,9 +359,9 @@ ENDIF (NOT WINDOWS)
 #-----------------------------------------------------------------------------
 MACRO (CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
   CHECK_INCLUDE_FILES ("${USE_INCLUDES};${FILE}" ${VARIABLE})
-  IF (${VARIABLE})
-    SET (USE_INCLUDES ${USE_INCLUDES} ${FILE})
-  ENDIF (${VARIABLE})
+  if (${VARIABLE})
+    set (USE_INCLUDES ${USE_INCLUDES} ${FILE})
+  endif (${VARIABLE})
 ENDMACRO (CHECK_INCLUDE_FILE_CONCAT)
 
 #-----------------------------------------------------------------------------
@@ -390,31 +383,31 @@ CHECK_INCLUDE_FILE_CONCAT ("stdint.h"        H5_HAVE_STDINT_H)
 # IF the c compiler found stdint, check the C++ as well. On some systems this
 # file will be found by C but not C++, only do this test IF the C++ compiler
 # has been initialized (e.g. the project also includes some c++)
-IF (H5_HAVE_STDINT_H AND CMAKE_CXX_COMPILER_LOADED)
+if (H5_HAVE_STDINT_H AND CMAKE_CXX_COMPILER_LOADED)
   CHECK_INCLUDE_FILE_CXX ("stdint.h" H5_HAVE_STDINT_H_CXX)
-  IF (NOT H5_HAVE_STDINT_H_CXX)
-    SET (H5_HAVE_STDINT_H "" CACHE INTERNAL "Have includes HAVE_STDINT_H")
-    SET (USE_INCLUDES ${USE_INCLUDES} "stdint.h")
-  ENDIF (NOT H5_HAVE_STDINT_H_CXX)
-ENDIF (H5_HAVE_STDINT_H AND CMAKE_CXX_COMPILER_LOADED)
+  if (NOT H5_HAVE_STDINT_H_CXX)
+    set (H5_HAVE_STDINT_H "" CACHE INTERNAL "Have includes HAVE_STDINT_H")
+    set (USE_INCLUDES ${USE_INCLUDES} "stdint.h")
+  endif (NOT H5_HAVE_STDINT_H_CXX)
+endif (H5_HAVE_STDINT_H AND CMAKE_CXX_COMPILER_LOADED)
 
 # Darwin
 CHECK_INCLUDE_FILE_CONCAT ("mach/mach_time.h" H5_HAVE_MACH_MACH_TIME_H)
 
 # Windows
 CHECK_INCLUDE_FILE_CONCAT ("io.h"            H5_HAVE_IO_H)
-IF (NOT CYGWIN)
+if (NOT CYGWIN)
   CHECK_INCLUDE_FILE_CONCAT ("winsock2.h"      H5_HAVE_WINSOCK2_H)
-ENDIF (NOT CYGWIN)
+endif (NOT CYGWIN)
 CHECK_INCLUDE_FILE_CONCAT ("sys/timeb.h"     H5_HAVE_SYS_TIMEB_H)
 
-IF (CMAKE_SYSTEM_NAME MATCHES "OSF")
+if (CMAKE_SYSTEM_NAME MATCHES "OSF")
   CHECK_INCLUDE_FILE_CONCAT ("sys/sysinfo.h" H5_HAVE_SYS_SYSINFO_H)
   CHECK_INCLUDE_FILE_CONCAT ("sys/proc.h"    H5_HAVE_SYS_PROC_H)
-ELSE (CMAKE_SYSTEM_NAME MATCHES "OSF")
-  SET (H5_HAVE_SYS_SYSINFO_H "" CACHE INTERNAL "" FORCE)
-  SET (H5_HAVE_SYS_PROC_H    "" CACHE INTERNAL "" FORCE)
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "OSF")
+else (CMAKE_SYSTEM_NAME MATCHES "OSF")
+  set (H5_HAVE_SYS_SYSINFO_H "" CACHE INTERNAL "" FORCE)
+  set (H5_HAVE_SYS_PROC_H    "" CACHE INTERNAL "" FORCE)
+endif (CMAKE_SYSTEM_NAME MATCHES "OSF")
 
 CHECK_INCLUDE_FILE_CONCAT ("globus/common.h" H5_HAVE_GLOBUS_COMMON_H)
 CHECK_INCLUDE_FILE_CONCAT ("pdb.h"           H5_HAVE_PDB_H)
@@ -434,12 +427,12 @@ CHECK_INCLUDE_FILE_CONCAT ("netinet/in.h"    H5_HAVE_NETINET_IN_H)
 #-----------------------------------------------------------------------------
 
 # The linux-lfs option is deprecated.
-SET (LINUX_LFS 0)
+set (LINUX_LFS 0)
 
-SET (HDF5_EXTRA_C_FLAGS)
-SET (HDF5_EXTRA_FLAGS)
-IF (NOT WINDOWS)
-  IF(NOT H5_HAVE_SOLARIS)
+set (HDF5_EXTRA_C_FLAGS)
+set (HDF5_EXTRA_FLAGS)
+if (NOT WINDOWS)
+  if (NOT H5_HAVE_SOLARIS)
   # Linux Specific flags
   # This was originally defined as _POSIX_SOURCE which was updated to
   # _POSIX_C_SOURCE=199506L to expose a greater amount of POSIX
@@ -447,93 +440,93 @@ IF (NOT WINDOWS)
   # correctly.
   # POSIX feature information can be found in the gcc manual at:
   # http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
-  SET (HDF5_EXTRA_C_FLAGS -D_POSIX_C_SOURCE=199506L)
-  SET (HDF5_EXTRA_FLAGS -D_BSD_SOURCE)
+  set (HDF5_EXTRA_C_FLAGS -D_POSIX_C_SOURCE=199506L)
+  set (HDF5_EXTRA_FLAGS -D_BSD_SOURCE)
   
-  OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-  IF (HDF5_ENABLE_LARGE_FILE)
-    SET (msg "Performing TEST_LFS_WORKS")
+  option (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
+  if (HDF5_ENABLE_LARGE_FILE)
+    set (msg "Performing TEST_LFS_WORKS")
     TRY_RUN (TEST_LFS_WORKS_RUN   TEST_LFS_WORKS_COMPILE
         ${HDF5_BINARY_DIR}/CMake
         ${HDF5_RESOURCES_DIR}/HDF5Tests.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-DTEST_LFS_WORKS
         OUTPUT_VARIABLE OUTPUT
     )
-    IF (TEST_LFS_WORKS_COMPILE)
-      IF (TEST_LFS_WORKS_RUN  MATCHES 0)
-        SET (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
-        SET (LARGEFILE 1)
-        SET (HDF5_EXTRA_FLAGS ${HDF5_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
-        MESSAGE (STATUS "${msg}... yes")
-      ELSE (TEST_LFS_WORKS_RUN  MATCHES 0)
-        SET (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-        MESSAGE (STATUS "${msg}... no")
-        FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+    if (TEST_LFS_WORKS_COMPILE)
+      if (TEST_LFS_WORKS_RUN  MATCHES 0)
+        set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
+        set (LARGEFILE 1)
+        set (HDF5_EXTRA_FLAGS ${HDF5_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
+        message (STATUS "${msg}... yes")
+      else (TEST_LFS_WORKS_RUN  MATCHES 0)
+        set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
+        message (STATUS "${msg}... no")
+        file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
               "Test TEST_LFS_WORKS Run failed with the following output and exit code:\n ${OUTPUT}\n"
         )
-      ENDIF (TEST_LFS_WORKS_RUN  MATCHES 0)
-    ELSE (TEST_LFS_WORKS_COMPILE )
-      SET (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-      MESSAGE (STATUS "${msg}... no")
-      FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+      endif (TEST_LFS_WORKS_RUN  MATCHES 0)
+    else (TEST_LFS_WORKS_COMPILE )
+      set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
+      message (STATUS "${msg}... no")
+      file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Test TEST_LFS_WORKS Compile failed with the following output:\n ${OUTPUT}\n"
       )
-    ENDIF (TEST_LFS_WORKS_COMPILE)
-  ENDIF (HDF5_ENABLE_LARGE_FILE)
-  SET (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${HDF5_EXTRA_FLAGS})
-  ENDIF(NOT H5_HAVE_SOLARIS)
-ENDIF (NOT WINDOWS)
+    endif (TEST_LFS_WORKS_COMPILE)
+  endif (HDF5_ENABLE_LARGE_FILE)
+  set (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${HDF5_EXTRA_FLAGS})
+  endif (NOT H5_HAVE_SOLARIS)
+endif (NOT WINDOWS)
 
-ADD_DEFINITIONS (${HDF5_EXTRA_FLAGS})
+add_definitions (${HDF5_EXTRA_FLAGS})
 
 #-----------------------------------------------------------------------------
 # Check for HAVE_OFF64_T functionality
 #-----------------------------------------------------------------------------
-IF (NOT WINDOWS OR MINGW)
+if (NOT WINDOWS OR MINGW)
   HDF5_FUNCTION_TEST (HAVE_OFF64_T)
-  IF (H5_HAVE_OFF64_T)
+  if (H5_HAVE_OFF64_T)
     CHECK_FUNCTION_EXISTS (lseek64            H5_HAVE_LSEEK64)
     CHECK_FUNCTION_EXISTS (fseeko64           H5_HAVE_FSEEKO64)
     CHECK_FUNCTION_EXISTS (ftello64           H5_HAVE_FTELLO64)
     CHECK_FUNCTION_EXISTS (ftruncate64        H5_HAVE_FTRUNCATE64)
-  ENDIF (H5_HAVE_OFF64_T)
+  endif (H5_HAVE_OFF64_T)
 
   CHECK_FUNCTION_EXISTS (fseeko               H5_HAVE_FSEEKO)
   CHECK_FUNCTION_EXISTS (ftello               H5_HAVE_FTELLO)
 
   HDF5_FUNCTION_TEST (HAVE_STAT64_STRUCT)
-  IF (HAVE_STAT64_STRUCT)
+  if (HAVE_STAT64_STRUCT)
     CHECK_FUNCTION_EXISTS (fstat64            H5_HAVE_FSTAT64)
     CHECK_FUNCTION_EXISTS (stat64             H5_HAVE_STAT64)
-  ENDIF (HAVE_STAT64_STRUCT)
-ENDIF (NOT WINDOWS OR MINGW)
+  endif (HAVE_STAT64_STRUCT)
+endif (NOT WINDOWS OR MINGW)
 
 #-----------------------------------------------------------------------------
 #  Check the size in bytes of all the int and float types
 #-----------------------------------------------------------------------------
 MACRO (H5_CHECK_TYPE_SIZE type var)
-  SET (aType ${type})
-  SET (aVar  ${var})
-#  MESSAGE (STATUS "Checking size of ${aType} and storing into ${aVar}")
+  set (aType ${type})
+  set (aVar  ${var})
+#  message (STATUS "Checking size of ${aType} and storing into ${aVar}")
   CHECK_TYPE_SIZE (${aType}   ${aVar})
-  IF (NOT ${aVar})
-    SET (${aVar} 0 CACHE INTERNAL "SizeOf for ${aType}")
-#    MESSAGE (STATUS "Size of ${aType} was NOT Found")
-  ENDIF (NOT ${aVar})
+  if (NOT ${aVar})
+    set (${aVar} 0 CACHE INTERNAL "SizeOf for ${aType}")
+#    message (STATUS "Size of ${aType} was NOT Found")
+  endif (NOT ${aVar})
 ENDMACRO (H5_CHECK_TYPE_SIZE)
 
 H5_CHECK_TYPE_SIZE (char           H5_SIZEOF_CHAR)
 H5_CHECK_TYPE_SIZE (short          H5_SIZEOF_SHORT)
 H5_CHECK_TYPE_SIZE (int            H5_SIZEOF_INT)
 H5_CHECK_TYPE_SIZE (unsigned       H5_SIZEOF_UNSIGNED)
-IF (NOT APPLE)
+if (NOT APPLE)
   H5_CHECK_TYPE_SIZE (long         H5_SIZEOF_LONG)
-ENDIF (NOT APPLE)
+endif (NOT APPLE)
 H5_CHECK_TYPE_SIZE ("long long"    H5_SIZEOF_LONG_LONG)
 H5_CHECK_TYPE_SIZE (__int64        H5_SIZEOF___INT64)
-IF (NOT H5_SIZEOF___INT64)
-  SET (H5_SIZEOF___INT64 0)
-ENDIF (NOT H5_SIZEOF___INT64)
+if (NOT H5_SIZEOF___INT64)
+  set (H5_SIZEOF___INT64 0)
+endif (NOT H5_SIZEOF___INT64)
 
 H5_CHECK_TYPE_SIZE (float          H5_SIZEOF_FLOAT)
 H5_CHECK_TYPE_SIZE (double         H5_SIZEOF_DOUBLE)
@@ -567,24 +560,24 @@ H5_CHECK_TYPE_SIZE (uint_least64_t H5_SIZEOF_UINT_LEAST64_T)
 H5_CHECK_TYPE_SIZE (int_fast64_t   H5_SIZEOF_INT_FAST64_T)
 H5_CHECK_TYPE_SIZE (uint_fast64_t  H5_SIZEOF_UINT_FAST64_T)
 
-IF (NOT APPLE)
+if (NOT APPLE)
   H5_CHECK_TYPE_SIZE (size_t       H5_SIZEOF_SIZE_T)
   H5_CHECK_TYPE_SIZE (ssize_t      H5_SIZEOF_SSIZE_T)
-  IF (NOT H5_SIZEOF_SSIZE_T)
-    SET (H5_SIZEOF_SSIZE_T 0)
-  ENDIF (NOT H5_SIZEOF_SSIZE_T)
-  IF (NOT WINDOWS)
+  if (NOT H5_SIZEOF_SSIZE_T)
+    set (H5_SIZEOF_SSIZE_T 0)
+  endif (NOT H5_SIZEOF_SSIZE_T)
+  if (NOT WINDOWS)
     H5_CHECK_TYPE_SIZE (ptrdiff_t    H5_SIZEOF_PTRDIFF_T)
-  ENDIF (NOT WINDOWS)
-ENDIF (NOT APPLE)
+  endif (NOT WINDOWS)
+endif (NOT APPLE)
 
 H5_CHECK_TYPE_SIZE (off_t          H5_SIZEOF_OFF_T)
 H5_CHECK_TYPE_SIZE (off64_t        H5_SIZEOF_OFF64_T)
-IF (NOT H5_SIZEOF_OFF64_T)
-  SET (H5_SIZEOF_OFF64_T 0)
-ENDIF (NOT H5_SIZEOF_OFF64_T)
+if (NOT H5_SIZEOF_OFF64_T)
+  set (H5_SIZEOF_OFF64_T 0)
+endif (NOT H5_SIZEOF_OFF64_T)
 
-IF (NOT WINDOWS)
+if (NOT WINDOWS)
   #-----------------------------------------------------------------------------
   # Check if the dev_t type is a scalar type
   #-----------------------------------------------------------------------------
@@ -599,7 +592,7 @@ IF (NOT WINDOWS)
   #-----------------------------------------------------------------------------
   # Check a bunch of time functions
   #-----------------------------------------------------------------------------
-  FOREACH (test
+  foreach (test
       HAVE_TM_GMTOFF
       HAVE___TM_GMTOFF
 #      HAVE_TIMEZONE
@@ -610,11 +603,11 @@ IF (NOT WINDOWS)
       HAVE_STRUCT_TM_TM_ZONE
   )
     HDF5_FUNCTION_TEST (${test})
-  ENDFOREACH (test)
-  IF (NOT CYGWIN AND NOT MINGW)
+  endforeach (test)
+  if (NOT CYGWIN AND NOT MINGW)
       HDF5_FUNCTION_TEST (HAVE_TIMEZONE)
 #      HDF5_FUNCTION_TEST (HAVE_STAT_ST_BLOCKS)
-  ENDIF (NOT CYGWIN AND NOT MINGW)
+  endif (NOT CYGWIN AND NOT MINGW)
 
   # ----------------------------------------------------------------------
   # Does the struct stat have the st_blocks field?  This field is not Posix.
@@ -630,12 +623,12 @@ IF (NOT WINDOWS)
   CHECK_FUNCTION_EXISTS (_getvideoconfig   H5_HAVE__GETVIDEOCONFIG)
   CHECK_FUNCTION_EXISTS (gettextinfo       H5_HAVE_GETTEXTINFO)
   CHECK_FUNCTION_EXISTS (_scrsize          H5_HAVE__SCRSIZE)
-  IF (NOT CYGWIN AND NOT MINGW)
+  if (NOT CYGWIN AND NOT MINGW)
     CHECK_FUNCTION_EXISTS (GetConsoleScreenBufferInfo    H5_HAVE_GETCONSOLESCREENBUFFERINFO)
-  ENDIF (NOT CYGWIN AND NOT MINGW)
+  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)
-ENDIF (NOT WINDOWS)
+endif (NOT WINDOWS)
 
 #-----------------------------------------------------------------------------
 # Check for some functions that are used
@@ -674,23 +667,23 @@ CHECK_FUNCTION_EXISTS (vasprintf         H5_HAVE_VASPRINTF)
 CHECK_FUNCTION_EXISTS (waitpid           H5_HAVE_WAITPID)
 
 CHECK_FUNCTION_EXISTS (vsnprintf         H5_HAVE_VSNPRINTF)
-IF (NOT WINDOWS)
-  IF (H5_HAVE_VSNPRINTF)
+if (NOT WINDOWS)
+  if (H5_HAVE_VSNPRINTF)
     HDF5_FUNCTION_TEST (VSNPRINTF_WORKS)
-  ENDIF (H5_HAVE_VSNPRINTF)
-ENDIF (NOT WINDOWS)
+  endif (H5_HAVE_VSNPRINTF)
+endif (NOT WINDOWS)
 
 #-----------------------------------------------------------------------------
 # sigsetjmp is special; may actually be a macro
 #-----------------------------------------------------------------------------
-IF (NOT H5_HAVE_SIGSETJMP)
-  IF (H5_HAVE_SETJMP_H)
+if (NOT H5_HAVE_SIGSETJMP)
+  if (H5_HAVE_SETJMP_H)
     CHECK_SYMBOL_EXISTS (sigsetjmp "setjmp.h" H5_HAVE_MACRO_SIGSETJMP)
-    IF (H5_HAVE_MACRO_SIGSETJMP)
-      SET (H5_HAVE_SIGSETJMP 1)
-    ENDIF (H5_HAVE_MACRO_SIGSETJMP)
-  ENDIF (H5_HAVE_SETJMP_H)
-ENDIF (NOT H5_HAVE_SIGSETJMP)
+    if (H5_HAVE_MACRO_SIGSETJMP)
+      set (H5_HAVE_SIGSETJMP 1)
+    endif (H5_HAVE_MACRO_SIGSETJMP)
+  endif (H5_HAVE_SETJMP_H)
+endif (NOT H5_HAVE_SIGSETJMP)
 
 #-----------------------------------------------------------------------------
 # Check for Symbols
@@ -699,8 +692,8 @@ CHECK_SYMBOL_EXISTS (tzname "time.h" H5_HAVE_DECL_TZNAME)
 #-----------------------------------------------------------------------------
 # Check a bunch of other functions
 #-----------------------------------------------------------------------------
-IF (NOT WINDOWS)
-  FOREACH (test
+if (NOT WINDOWS)
+  foreach (test
       LONE_COLON
       HAVE_ATTRIBUTE
       HAVE_C99_FUNC
@@ -711,40 +704,40 @@ IF (NOT WINDOWS)
       CXX_HAVE_OFFSETOF
   )
     HDF5_FUNCTION_TEST (${test})
-  ENDFOREACH (test)
-ENDIF (NOT WINDOWS)
+  endforeach (test)
+endif (NOT WINDOWS)
 
 # For other CXX specific tests, use this MACRO.
 MACRO (HDF5_CXX_FUNCTION_TEST OTHER_TEST)
-  IF ("${OTHER_TEST}" MATCHES "^${OTHER_TEST}$")
-    SET (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
-    SET (OTHER_TEST_ADD_LIBRARIES)
-    IF (CMAKE_REQUIRED_LIBRARIES)
-      SET (OTHER_TEST_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
-    ENDIF (CMAKE_REQUIRED_LIBRARIES)
-
-    FOREACH (def ${HDF5_EXTRA_TEST_DEFINITIONS})
-      SET (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}=${${def}}")
-    ENDFOREACH (def)
-
-    FOREACH (def
+  if ("${OTHER_TEST}" MATCHES "^${OTHER_TEST}$")
+    set (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
+    set (OTHER_TEST_ADD_LIBRARIES)
+    if (CMAKE_REQUIRED_LIBRARIES)
+      set (OTHER_TEST_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+    endif (CMAKE_REQUIRED_LIBRARIES)
+
+    foreach (def ${HDF5_EXTRA_TEST_DEFINITIONS})
+      set (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}=${${def}}")
+    endforeach (def)
+
+    foreach (def
         HAVE_SYS_TIME_H
         HAVE_UNISTD_H
         HAVE_SYS_TYPES_H
         HAVE_SYS_SOCKET_H
     )
-      IF ("${H5_${def}}")
-        SET (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}")
-      ENDIF ("${H5_${def}}")
-    ENDFOREACH (def)
+      if ("${H5_${def}}")
+        set (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}")
+      endif ("${H5_${def}}")
+    endforeach (def)
 
-    IF (LARGEFILE)
-      SET (MACRO_CHECK_FUNCTION_DEFINITIONS
+    if (LARGEFILE)
+      set (MACRO_CHECK_FUNCTION_DEFINITIONS
           "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE"
       )
-    ENDIF (LARGEFILE)
+    endif (LARGEFILE)
 
-    #MESSAGE (STATUS "Performing ${OTHER_TEST}")
+    #message (STATUS "Performing ${OTHER_TEST}")
     TRY_COMPILE (${OTHER_TEST}
         ${CMAKE_BINARY_DIR}
         ${HDF5_RESOURCES_DIR}/HDF5CXXTests.cpp
@@ -752,25 +745,25 @@ MACRO (HDF5_CXX_FUNCTION_TEST OTHER_TEST)
         "${OTHER_TEST_ADD_LIBRARIES}"
         OUTPUT_VARIABLE OUTPUT
     )
-    IF ("${OTHER_TEST}" EQUAL 0)
-      SET (${OTHER_TEST} 1 CACHE INTERNAL "CXX test ${FUNCTION}")
-      MESSAGE (STATUS "Performing CXX Test ${OTHER_TEST} - Success")
-    ELSE ("${OTHER_TEST}" EQUAL 0)
-      MESSAGE (STATUS "Performing CXX Test ${OTHER_TEST} - Failed")
-      SET (${OTHER_TEST} "" CACHE INTERNAL "CXX test ${FUNCTION}")
-      FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+    if ("${OTHER_TEST}" EQUAL 0)
+      set (${OTHER_TEST} 1 CACHE INTERNAL "CXX test ${FUNCTION}")
+      message (STATUS "Performing CXX Test ${OTHER_TEST} - Success")
+    else ("${OTHER_TEST}" EQUAL 0)
+      message (STATUS "Performing CXX Test ${OTHER_TEST} - Failed")
+      set (${OTHER_TEST} "" CACHE INTERNAL "CXX test ${FUNCTION}")
+      file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Performing CXX Test ${OTHER_TEST} failed with the following output:\n"
           "${OUTPUT}\n"
       )
-    ENDIF ("${OTHER_TEST}" EQUAL 0)
-  ENDIF ("${OTHER_TEST}" MATCHES "^${OTHER_TEST}$")
+    endif ("${OTHER_TEST}" EQUAL 0)
+  endif ("${OTHER_TEST}" MATCHES "^${OTHER_TEST}$")
 ENDMACRO (HDF5_CXX_FUNCTION_TEST)
 
 #-----------------------------------------------------------------------------
 # Check a bunch of cxx functions
 #-----------------------------------------------------------------------------
-IF (CMAKE_CXX_COMPILER_LOADED)
-  FOREACH (test
+if (CMAKE_CXX_COMPILER_LOADED)
+  foreach (test
       OLD_HEADER_FILENAME
       H5_NO_NAMESPACE
       H5_NO_STD
@@ -778,81 +771,71 @@ IF (CMAKE_CXX_COMPILER_LOADED)
       NO_STATIC_CAST
   )
     HDF5_CXX_FUNCTION_TEST (${test})
-  ENDFOREACH (test)
-ENDIF (CMAKE_CXX_COMPILER_LOADED)
+  endforeach (test)
+endif (CMAKE_CXX_COMPILER_LOADED)
 
 #-----------------------------------------------------------------------------
 #  Check if Direct I/O driver works
 #-----------------------------------------------------------------------------
-IF (NOT WINDOWS)
-  OPTION (HDF5_ENABLE_DIRECT_VFD "Build the Direct I/O Virtual File Driver" ON)
-  IF (HDF5_ENABLE_DIRECT_VFD)
-    SET (msg "Performing TEST_DIRECT_VFD_WORKS")
-    SET (MACRO_CHECK_FUNCTION_DEFINITIONS "-DTEST_DIRECT_VFD_WORKS -D_GNU_SOURCE ${CMAKE_REQUIRED_FLAGS}")
+if (NOT WINDOWS)
+  option (HDF5_ENABLE_DIRECT_VFD "Build the Direct I/O Virtual File Driver" ON)
+  if (HDF5_ENABLE_DIRECT_VFD)
+    set (msg "Performing TEST_DIRECT_VFD_WORKS")
+    set (MACRO_CHECK_FUNCTION_DEFINITIONS "-DTEST_DIRECT_VFD_WORKS -D_GNU_SOURCE ${CMAKE_REQUIRED_FLAGS}")
     TRY_RUN (TEST_DIRECT_VFD_WORKS_RUN   TEST_DIRECT_VFD_WORKS_COMPILE
         ${HDF5_BINARY_DIR}/CMake
         ${HDF5_RESOURCES_DIR}/HDF5Tests.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
         OUTPUT_VARIABLE OUTPUT
     )
-    IF (TEST_DIRECT_VFD_WORKS_COMPILE)
-      IF (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
+    if (TEST_DIRECT_VFD_WORKS_COMPILE)
+      if (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
         HDF5_FUNCTION_TEST (HAVE_DIRECT)
-        SET (CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
-        ADD_DEFINITIONS ("-D_GNU_SOURCE")
-      ELSE (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
-        SET (TEST_DIRECT_VFD_WORKS "" CACHE INTERNAL ${msg})
-        MESSAGE (STATUS "${msg}... no")
-        FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+        set (CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
+        add_definitions ("-D_GNU_SOURCE")
+      else (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
+        set (TEST_DIRECT_VFD_WORKS "" CACHE INTERNAL ${msg})
+        message (STATUS "${msg}... no")
+        file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
               "Test TEST_DIRECT_VFD_WORKS Run failed with the following output and exit code:\n ${OUTPUT}\n"
         )
-      ENDIF (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
-    ELSE (TEST_DIRECT_VFD_WORKS_COMPILE )
-      SET (TEST_DIRECT_VFD_WORKS "" CACHE INTERNAL ${msg})
-      MESSAGE (STATUS "${msg}... no")
-      FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+      endif (TEST_DIRECT_VFD_WORKS_RUN  MATCHES 0)
+    else (TEST_DIRECT_VFD_WORKS_COMPILE )
+      set (TEST_DIRECT_VFD_WORKS "" CACHE INTERNAL ${msg})
+      message (STATUS "${msg}... no")
+      file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Test TEST_DIRECT_VFD_WORKS Compile failed with the following output:\n ${OUTPUT}\n"
       )
-    ENDIF (TEST_DIRECT_VFD_WORKS_COMPILE)
-  ENDIF (HDF5_ENABLE_DIRECT_VFD)
-ENDIF (NOT WINDOWS)
-
-#-----------------------------------------------------------------------------
-#  Check for the Stream VFD driver
-#-----------------------------------------------------------------------------
-IF (HDF5_STREAM_VFD)
-  CHECK_INCLUDE_FILE_CONCAT ("netdb.h"       H5_HAVE_NETDB_H)
-  CHECK_INCLUDE_FILE_CONCAT ("netinet/tcp.h" H5_HAVE_NETINET_TCP_H)
-  CHECK_INCLUDE_FILE_CONCAT ("sys/filio.h"   H5_HAVE_SYS_FILIO_H)
-  SET (H5_HAVE_STREAM 1)
-ENDIF (HDF5_STREAM_VFD)
+    endif (TEST_DIRECT_VFD_WORKS_COMPILE)
+  endif (HDF5_ENABLE_DIRECT_VFD)
+endif (NOT WINDOWS)
 
 #-----------------------------------------------------------------------------
 # Check if InitOnceExecuteOnce is available
 #-----------------------------------------------------------------------------
-IF (WINDOWS)
-  IF (NOT HDF5_NO_IOEO_TEST)
-  MESSAGE (STATUS "Checking for InitOnceExecuteOnce:")
-  IF("${H5_HAVE_IOEO}" MATCHES "^${H5_HAVE_IOEO}$")
-    IF (LARGEFILE)
-      SET (CMAKE_REQUIRED_DEFINITIONS
+if (WINDOWS)
+  if (NOT HDF5_NO_IOEO_TEST)
+  message (STATUS "Checking for InitOnceExecuteOnce:")
+  if ("${H5_HAVE_IOEO}" MATCHES "^${H5_HAVE_IOEO}$")
+    if (LARGEFILE)
+      set (CMAKE_REQUIRED_DEFINITIONS
           "${CURRENT_TEST_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE"
       )
-    ENDIF (LARGEFILE)
-    SET(MACRO_CHECK_FUNCTION_DEFINITIONS 
+    endif (LARGEFILE)
+    set (MACRO_CHECK_FUNCTION_DEFINITIONS 
       "-DHAVE_IOEO ${CMAKE_REQUIRED_FLAGS}")
-    IF(CMAKE_REQUIRED_LIBRARIES)
-      SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES
+    if (CMAKE_REQUIRED_LIBRARIES)
+      set (CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES
         "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
-    ELSE(CMAKE_REQUIRED_LIBRARIES)
-      SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)
-    ENDIF(CMAKE_REQUIRED_LIBRARIES)
-    IF(CMAKE_REQUIRED_INCLUDES)
-      SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES
+    else (CMAKE_REQUIRED_LIBRARIES)
+      set (CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)
+    endif (CMAKE_REQUIRED_LIBRARIES)
+    if (CMAKE_REQUIRED_INCLUDES)
+      set (CHECK_C_SOURCE_COMPILES_ADD_INCLUDES
         "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
-    ELSE(CMAKE_REQUIRED_INCLUDES)
-      SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)
-    ENDIF(CMAKE_REQUIRED_INCLUDES)
+    else (CMAKE_REQUIRED_INCLUDES)
+      set (CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)
+    endif (CMAKE_REQUIRED_INCLUDES)
 
     TRY_RUN(HAVE_IOEO_EXITCODE HAVE_IOEO_COMPILED
       ${CMAKE_BINARY_DIR}
@@ -864,108 +847,96 @@ IF (WINDOWS)
       "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}"
       COMPILE_OUTPUT_VARIABLE OUTPUT)
     # if it did not compile make the return value fail code of 1
-    IF(NOT HAVE_IOEO_COMPILED)
-      SET(HAVE_IOEO_EXITCODE 1)
-    ENDIF(NOT HAVE_IOEO_COMPILED)
+    if (NOT HAVE_IOEO_COMPILED)
+      set (HAVE_IOEO_EXITCODE 1)
+    endif (NOT HAVE_IOEO_COMPILED)
     # if the return value was 0 then it worked
-    IF("${HAVE_IOEO_EXITCODE}" EQUAL 0)
-      SET(H5_HAVE_IOEO 1 CACHE INTERNAL "Test InitOnceExecuteOnce")
-      MESSAGE(STATUS "Performing Test InitOnceExecuteOnce - Success")
-      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 
+    if ("${HAVE_IOEO_EXITCODE}" EQUAL 0)
+      set (H5_HAVE_IOEO 1 CACHE INTERNAL "Test InitOnceExecuteOnce")
+      message (STATUS "Performing Test InitOnceExecuteOnce - Success")
+      file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 
         "Performing C SOURCE FILE Test InitOnceExecuteOnce succeded with the following output:\n"
         "${OUTPUT}\n"
         "Return value: ${HAVE_IOEO}\n")
-    ELSE("${HAVE_IOEO_EXITCODE}" EQUAL 0)
-      IF(CMAKE_CROSSCOMPILING AND "${HAVE_IOEO_EXITCODE}" MATCHES  "FAILED_TO_RUN")
-        SET(H5_HAVE_IOEO "${HAVE_IOEO_EXITCODE}")
-      ELSE(CMAKE_CROSSCOMPILING AND "${HAVE_IOEO_EXITCODE}" MATCHES  "FAILED_TO_RUN")
-        SET(H5_HAVE_IOEO "" CACHE INTERNAL "Test InitOnceExecuteOnce")
-      ENDIF(CMAKE_CROSSCOMPILING AND "${HAVE_IOEO_EXITCODE}" MATCHES  "FAILED_TO_RUN")
-
-      MESSAGE(STATUS "Performing Test InitOnceExecuteOnce - Failed")
-      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
+    else ("${HAVE_IOEO_EXITCODE}" EQUAL 0)
+      if (CMAKE_CROSSCOMPILING AND "${HAVE_IOEO_EXITCODE}" MATCHES  "FAILED_TO_RUN")
+        set (H5_HAVE_IOEO "${HAVE_IOEO_EXITCODE}")
+      else (CMAKE_CROSSCOMPILING AND "${HAVE_IOEO_EXITCODE}" MATCHES  "FAILED_TO_RUN")
+        set (H5_HAVE_IOEO "" CACHE INTERNAL "Test InitOnceExecuteOnce")
+      endif (CMAKE_CROSSCOMPILING AND "${HAVE_IOEO_EXITCODE}" MATCHES  "FAILED_TO_RUN")
+
+      message (STATUS "Performing Test InitOnceExecuteOnce - Failed")
+      file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
         "Performing InitOnceExecuteOnce Test  failed with the following output:\n"
         "${OUTPUT}\n"
         "Return value: ${HAVE_IOEO_EXITCODE}\n")
-    ENDIF("${HAVE_IOEO_EXITCODE}" EQUAL 0)
-  ENDIF("${H5_HAVE_IOEO}" MATCHES "^${H5_HAVE_IOEO}$")
-  ENDIF (NOT HDF5_NO_IOEO_TEST)
-ENDIF (WINDOWS)
-
-#-----------------------------------------------------------------------------
-# Option to see if GPFS is available on this filesystem --enable-gpfs
-#-----------------------------------------------------------------------------
-OPTION (HDF5_ENABLE_GPFS "Enable GPFS hints for the MPI/POSIX file driver" OFF)
-IF (HDF5_ENABLE_GPFS)
-  CHECK_INCLUDE_FILE_CONCAT ("gpfs.h"        HAVE_GPFS)
-  IF (HAVE_GPFS)
-    HDF5_FUNCTION_TEST (HAVE_GPFS)  
-  ENDIF (HAVE_GPFS)
-ENDIF (HDF5_ENABLE_GPFS)
-MARK_AS_ADVANCED (HDF5_ENABLE_GPFS)
+    endif ("${HAVE_IOEO_EXITCODE}" EQUAL 0)
+  endif ("${H5_HAVE_IOEO}" MATCHES "^${H5_HAVE_IOEO}$")
+  endif (NOT HDF5_NO_IOEO_TEST)
+endif (WINDOWS)
 
 #-----------------------------------------------------------------------------
 # Determine how 'inline' is used
 #-----------------------------------------------------------------------------
-SET (HDF5_EXTRA_TEST_DEFINITIONS INLINE_TEST_INLINE)
-FOREACH (inline_test inline __inline__ __inline)
-  SET (INLINE_TEST_INLINE ${inline_test})
+set (HDF5_EXTRA_TEST_DEFINITIONS INLINE_TEST_INLINE)
+foreach (inline_test inline __inline__ __inline)
+  set (INLINE_TEST_INLINE ${inline_test})
   HDF5_FUNCTION_TEST (INLINE_TEST_${inline_test})
-ENDFOREACH (inline_test)
-
-SET (HDF5_EXTRA_TEST_DEFINITIONS)
-IF (INLINE_TEST___inline__)
-  SET (H5_inline __inline__)
-ELSE (INLINE_TEST___inline__)
-  IF (INLINE_TEST___inline)
-    SET (H5_inline __inline)
-  ELSE (INLINE_TEST___inline)
-    IF (INLINE_TEST_inline)
-      SET (H5_inline inline)
-    ENDIF (INLINE_TEST_inline)
-  ENDIF (INLINE_TEST___inline)
-ENDIF (INLINE_TEST___inline__)
+endforeach (inline_test)
+
+set (HDF5_EXTRA_TEST_DEFINITIONS)
+if (INLINE_TEST___inline__)
+  set (H5_inline __inline__)
+else (INLINE_TEST___inline__)
+  if (INLINE_TEST___inline)
+    set (H5_inline __inline)
+  else (INLINE_TEST___inline)
+    if (INLINE_TEST_inline)
+      set (H5_inline inline)
+    endif (INLINE_TEST_inline)
+  endif (INLINE_TEST___inline)
+endif (INLINE_TEST___inline__)
 
 #-----------------------------------------------------------------------------
 # Check how to print a Long Long integer
 #-----------------------------------------------------------------------------
-IF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown")
-  SET (PRINT_LL_FOUND 0)
-  MESSAGE (STATUS "Checking for appropriate format for 64 bit long:")
-  FOREACH (HDF5_PRINTF_LL l64 l L q I64 ll)
-    SET (CURRENT_TEST_DEFINITIONS "-DPRINTF_LL_WIDTH=${HDF5_PRINTF_LL}")
-    IF (H5_SIZEOF_LONG_LONG)
-      SET (CURRENT_TEST_DEFINITIONS "${CURRENT_TEST_DEFINITIONS} -DHAVE_LONG_LONG")
-    ENDIF (H5_SIZEOF_LONG_LONG)
+if (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown")
+  set (PRINT_LL_FOUND 0)
+  message (STATUS "Checking for appropriate format for 64 bit long:")
+  foreach (HDF5_PRINTF_LL l64 l L q I64 ll)
+    set (CURRENT_TEST_DEFINITIONS "-DPRINTF_LL_WIDTH=${HDF5_PRINTF_LL}")
+    if (H5_SIZEOF_LONG_LONG)
+      set (CURRENT_TEST_DEFINITIONS "${CURRENT_TEST_DEFINITIONS} -DHAVE_LONG_LONG")
+    endif (H5_SIZEOF_LONG_LONG)
     TRY_RUN (HDF5_PRINTF_LL_TEST_RUN   HDF5_PRINTF_LL_TEST_COMPILE
         ${HDF5_BINARY_DIR}/CMake
         ${HDF5_RESOURCES_DIR}/HDF5Tests.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CURRENT_TEST_DEFINITIONS}
         OUTPUT_VARIABLE OUTPUT
     )
-    IF (HDF5_PRINTF_LL_TEST_COMPILE)
-      IF (HDF5_PRINTF_LL_TEST_RUN MATCHES 0)
-        SET (H5_PRINTF_LL_WIDTH "\"${HDF5_PRINTF_LL}\"" CACHE INTERNAL "Width for printf for type `long long' or `__int64', us. `ll")
-        SET (PRINT_LL_FOUND 1)
-      ELSE (HDF5_PRINTF_LL_TEST_RUN MATCHES 0)
-        MESSAGE ("Width with ${HDF5_PRINTF_LL} failed with result: ${HDF5_PRINTF_LL_TEST_RUN}")
-      ENDIF (HDF5_PRINTF_LL_TEST_RUN MATCHES 0)
-    ELSE (HDF5_PRINTF_LL_TEST_COMPILE)
-      FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+    if (HDF5_PRINTF_LL_TEST_COMPILE)
+      if (HDF5_PRINTF_LL_TEST_RUN MATCHES 0)
+        set (H5_PRINTF_LL_WIDTH "\"${HDF5_PRINTF_LL}\"" CACHE INTERNAL "Width for printf for type `long long' or `__int64', us. `ll")
+        set (PRINT_LL_FOUND 1)
+      else (HDF5_PRINTF_LL_TEST_RUN MATCHES 0)
+        message ("Width with ${HDF5_PRINTF_LL} failed with result: ${HDF5_PRINTF_LL_TEST_RUN}")
+      endif (HDF5_PRINTF_LL_TEST_RUN MATCHES 0)
+    else (HDF5_PRINTF_LL_TEST_COMPILE)
+      file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Test H5_PRINTF_LL_WIDTH for ${HDF5_PRINTF_LL} failed with the following output:\n ${OUTPUT}\n"
       )
-    ENDIF (HDF5_PRINTF_LL_TEST_COMPILE)
-  ENDFOREACH (HDF5_PRINTF_LL)
-
-  IF (PRINT_LL_FOUND)
-    MESSAGE (STATUS "Checking for apropriate format for 64 bit long: found ${H5_PRINTF_LL_WIDTH}")
-  ELSE (PRINT_LL_FOUND)
-    MESSAGE (STATUS "Checking for apropriate format for 64 bit long: not found")
-    SET (H5_PRINTF_LL_WIDTH "\"unknown\"" CACHE INTERNAL
+    endif (HDF5_PRINTF_LL_TEST_COMPILE)
+  endforeach (HDF5_PRINTF_LL)
+
+  if (PRINT_LL_FOUND)
+    message (STATUS "Checking for apropriate format for 64 bit long: found ${H5_PRINTF_LL_WIDTH}")
+  else (PRINT_LL_FOUND)
+    message (STATUS "Checking for apropriate format for 64 bit long: not found")
+    set (H5_PRINTF_LL_WIDTH "\"unknown\"" CACHE INTERNAL
         "Width for printf for type `long long' or `__int64', us. `ll"
     )
-  ENDIF (PRINT_LL_FOUND)
-ENDIF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown")
+  endif (PRINT_LL_FOUND)
+endif (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown")
 
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can handle converting
@@ -973,62 +944,62 @@ ENDIF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown")
 # (This flag should be set for all machines, except for the Crays, where
 # the cache value is set in it's config file)
 #
-SET (H5_CONVERT_DENORMAL_FLOAT 1)
+set (H5_CONVERT_DENORMAL_FLOAT 1)
 
 #-----------------------------------------------------------------------------
 #  Are we going to use HSIZE_T
 #-----------------------------------------------------------------------------
-IF (HDF5_ENABLE_HSIZET)
-  SET (H5_HAVE_LARGE_HSIZET 1)
-ENDIF (HDF5_ENABLE_HSIZET)
+if (HDF5_ENABLE_HSIZET)
+  set (H5_HAVE_LARGE_HSIZET 1)
+endif (HDF5_ENABLE_HSIZET)
 
 #-----------------------------------------------------------------------------
 # Macro to determine the various conversion capabilities
 #-----------------------------------------------------------------------------
 MACRO (H5ConversionTests TEST msg)
-  IF ("${TEST}" MATCHES "^${TEST}$")
-   # MESSAGE (STATUS "===> ${TEST}")
+  if ("${TEST}" MATCHES "^${TEST}$")
+   # message (STATUS "===> ${TEST}")
     TRY_RUN (${TEST}_RUN   ${TEST}_COMPILE
         ${HDF5_BINARY_DIR}/CMake
         ${HDF5_RESOURCES_DIR}/ConversionTests.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-D${TEST}_TEST
         OUTPUT_VARIABLE OUTPUT
     )
-    IF (${TEST}_COMPILE)
-      IF (${TEST}_RUN  MATCHES 0)
-        SET (${TEST} 1 CACHE INTERNAL ${msg})
-        MESSAGE (STATUS "${msg}... yes")
-      ELSE (${TEST}_RUN  MATCHES 0)
-        SET (${TEST} "" CACHE INTERNAL ${msg})
-        MESSAGE (STATUS "${msg}... no")
-        FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+    if (${TEST}_COMPILE)
+      if (${TEST}_RUN  MATCHES 0)
+        set (${TEST} 1 CACHE INTERNAL ${msg})
+        message (STATUS "${msg}... yes")
+      else (${TEST}_RUN  MATCHES 0)
+        set (${TEST} "" CACHE INTERNAL ${msg})
+        message (STATUS "${msg}... no")
+        file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
               "Test ${TEST} Run failed with the following output and exit code:\n ${OUTPUT}\n"
         )
-      ENDIF (${TEST}_RUN  MATCHES 0)
-    ELSE (${TEST}_COMPILE )
-      SET (${TEST} "" CACHE INTERNAL ${msg})
-      MESSAGE (STATUS "${msg}... no")
-      FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+      endif (${TEST}_RUN  MATCHES 0)
+    else (${TEST}_COMPILE )
+      set (${TEST} "" CACHE INTERNAL ${msg})
+      message (STATUS "${msg}... no")
+      file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
           "Test ${TEST} Compile failed with the following output:\n ${OUTPUT}\n"
       )
-    ENDIF (${TEST}_COMPILE)
+    endif (${TEST}_COMPILE)
 
-  ENDIF("${TEST}" MATCHES "^${TEST}$")
+  endif ("${TEST}" MATCHES "^${TEST}$")
 ENDMACRO (H5ConversionTests)
 
 #-----------------------------------------------------------------------------
 # Macro to make some of the conversion tests easier to write/read
 #-----------------------------------------------------------------------------
 MACRO (H5MiscConversionTest  VAR TEST msg)
-  IF ("${TEST}" MATCHES "^${TEST}$")
-    IF (${VAR})
-      SET (${TEST} 1 CACHE INTERNAL ${msg})
-      MESSAGE (STATUS "${msg}... yes")
-    ELSE (${VAR})
-      SET (${TEST} "" CACHE INTERNAL ${msg})
-      MESSAGE (STATUS "${msg}... no")
-    ENDIF (${VAR})
-  ENDIF ("${TEST}" MATCHES "^${TEST}$")
+  if ("${TEST}" MATCHES "^${TEST}$")
+    if (${VAR})
+      set (${TEST} 1 CACHE INTERNAL ${msg})
+      message (STATUS "${msg}... yes")
+    else (${VAR})
+      set (${TEST} "" CACHE INTERNAL ${msg})
+      message (STATUS "${msg}... no")
+    endif (${VAR})
+  endif ("${TEST}" MATCHES "^${TEST}$")
 ENDMACRO (H5MiscConversionTest)
 
 #-----------------------------------------------------------------------------
@@ -1051,9 +1022,9 @@ H5MiscConversionTest (H5_SIZEOF_LONG_DOUBLE H5_LDOUBLE_TO_INTEGER_ACCURATE "chec
 # integers except 'unsigned long long'.  Other HP-UX systems are unknown
 # yet. (1/8/05 - SLU)
 #
-IF (NOT MSVC)
+if (NOT MSVC)
   H5ConversionTests (H5_LDOUBLE_TO_INTEGER_WORKS "Checking IF converting from long double to integers works")
-ENDIF (NOT MSVC)
+endif (NOT MSVC)
 # -----------------------------------------------------------------------
 # Set flag to indicate that the machine can handle conversion from
 # integers to long double.  (This flag should be set "yes" for all
@@ -1079,11 +1050,11 @@ H5ConversionTests (H5_ULONG_TO_FLOAT_ACCURATE "Checking IF accurately converting
 # 64-bit machines, where the short program below tests if round-up is
 # correctly handled.
 #
-IF (CMAKE_SYSTEM MATCHES "solaris2.*")
+if (CMAKE_SYSTEM MATCHES "solaris2.*")
   H5ConversionTests (H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE "Checking IF accurately converting unsigned long long to floating-point values")
-ELSE (CMAKE_SYSTEM MATCHES "solaris2.*")
-  SET(H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE 1)
-ENDIF (CMAKE_SYSTEM MATCHES "solaris2.*")
+else (CMAKE_SYSTEM MATCHES "solaris2.*")
+  set (H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE 1)
+endif (CMAKE_SYSTEM MATCHES "solaris2.*")
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can accurately convert
 # 'float' or 'double' to 'unsigned long long' values.
@@ -1111,19 +1082,19 @@ H5ConversionTests (H5_LDOUBLE_TO_UINT_ACCURATE "Checking IF correctly converting
 # 'unsigned long long' to 'float' and 'double' typecasts.
 # (This flag should be set for all machines.)
 #
-IF (H5_ULLONG_TO_FP_CAST_WORKS MATCHES ^H5_ULLONG_TO_FP_CAST_WORKS$)
-  SET (H5_ULLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling unsigned long long to floating-point typecasts work")
-  MESSAGE (STATUS "Checking IF compiling unsigned long long to floating-point typecasts work... yes")
-ENDIF (H5_ULLONG_TO_FP_CAST_WORKS MATCHES ^H5_ULLONG_TO_FP_CAST_WORKS$)
+if (H5_ULLONG_TO_FP_CAST_WORKS MATCHES ^H5_ULLONG_TO_FP_CAST_WORKS$)
+  set (H5_ULLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling unsigned long long to floating-point typecasts work")
+  message (STATUS "Checking IF compiling unsigned long long to floating-point typecasts work... yes")
+endif (H5_ULLONG_TO_FP_CAST_WORKS MATCHES ^H5_ULLONG_TO_FP_CAST_WORKS$)
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can _compile_
 # 'long long' to 'float' and 'double' typecasts.
 # (This flag should be set for all machines.)
 #
-IF (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$)
-  SET (H5_LLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling long long to floating-point typecasts work")
-  MESSAGE (STATUS "Checking IF compiling long long to floating-point typecasts work... yes")
-ENDIF (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$)
+if (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$)
+  set (H5_LLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling long long to floating-point typecasts work")
+  message (STATUS "Checking IF compiling long long to floating-point typecasts work... yes")
+endif (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$)
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can convert from
 # 'unsigned long long' to 'long double' without precision loss.
@@ -1131,9 +1102,9 @@ ENDIF (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$)
 # where the last 2 bytes of mantissa are lost when compiler tries to do
 # the conversion, and Cygwin where compiler doesn't do rounding correctly.)
 #
-IF (NOT MSVC)
+if (NOT MSVC)
   H5ConversionTests (H5_ULLONG_TO_LDOUBLE_PRECISION "Checking IF converting unsigned long long to long double with precision")
-ENDIF (NOT MSVC)
+endif (NOT MSVC)
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can handle overflow converting
 # all floating-point to all integer types.
@@ -1151,10 +1122,10 @@ H5ConversionTests (H5_FP_TO_INTEGER_OVERFLOW_WORKS  "Checking IF overflows norma
 # The machine's conversion gets the correct value.  We define the macro and disable
 # this kind of test until we figure out what algorithm they use.
 #
-IF (H5_LDOUBLE_TO_LONG_SPECIAL MATCHES ^H5_LDOUBLE_TO_LONG_SPECIAL$)
-  SET (H5_LDOUBLE_TO_LONG_SPECIAL 0 CACHE INTERNAL "Define if your system converts long double to (unsigned) long values with special algorithm")
-  MESSAGE (STATUS "Checking IF your system converts long double to (unsigned) long values with special algorithm... no")
-ENDIF (H5_LDOUBLE_TO_LONG_SPECIAL MATCHES ^H5_LDOUBLE_TO_LONG_SPECIAL$)
+if (H5_LDOUBLE_TO_LONG_SPECIAL MATCHES ^H5_LDOUBLE_TO_LONG_SPECIAL$)
+  set (H5_LDOUBLE_TO_LONG_SPECIAL 0 CACHE INTERNAL "Define if your system converts long double to (unsigned) long values with special algorithm")
+  message (STATUS "Checking IF your system converts long double to (unsigned) long values with special algorithm... no")
+endif (H5_LDOUBLE_TO_LONG_SPECIAL MATCHES ^H5_LDOUBLE_TO_LONG_SPECIAL$)
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine is using a special algorithm
 # to convert some values of '(unsigned) long' to 'long double' values.  
@@ -1163,10 +1134,10 @@ ENDIF (H5_LDOUBLE_TO_LONG_SPECIAL MATCHES ^H5_LDOUBLE_TO_LONG_SPECIAL$)
 # ..., 7fffff..., the compiler uses a unknown algorithm.  We define a 
 # macro and skip the test for now until we know about the algorithm.
 #
-IF (H5_LONG_TO_LDOUBLE_SPECIAL MATCHES ^H5_LONG_TO_LDOUBLE_SPECIAL$)
-  SET (H5_LONG_TO_LDOUBLE_SPECIAL 0 CACHE INTERNAL "Define if your system can convert (unsigned) long to long double values with special algorithm")
-  MESSAGE (STATUS "Checking IF your system can convert (unsigned) long to long double values with special algorithm... no")
-ENDIF (H5_LONG_TO_LDOUBLE_SPECIAL MATCHES ^H5_LONG_TO_LDOUBLE_SPECIAL$)
+if (H5_LONG_TO_LDOUBLE_SPECIAL MATCHES ^H5_LONG_TO_LDOUBLE_SPECIAL$)
+  set (H5_LONG_TO_LDOUBLE_SPECIAL 0 CACHE INTERNAL "Define if your system can convert (unsigned) long to long double values with special algorithm")
+  message (STATUS "Checking IF your system can convert (unsigned) long to long double values with special algorithm... no")
+endif (H5_LONG_TO_LDOUBLE_SPECIAL MATCHES ^H5_LONG_TO_LDOUBLE_SPECIAL$)
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can accurately convert
 # 'long double' to '(unsigned) long long' values.  (This flag should be set for
@@ -1191,10 +1162,10 @@ H5ConversionTests (H5_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting
 # (This flag should be set to no for all machines, except for SGI IRIX64,
 # where the cache value is set to yes in it's config file)
 #
-IF (H5_BAD_LOG2_CODE_GENERATED MATCHES ^H5_BAD_LOG2_CODE_GENERATED$)
-  SET (H5_BAD_LOG2_CODE_GENERATED 0 CACHE INTERNAL "Define if your system generates wrong code for log2 routine")
-  MESSAGE (STATUS "Checking IF your system generates wrong code for log2 routine... no")
-ENDIF (H5_BAD_LOG2_CODE_GENERATED MATCHES ^H5_BAD_LOG2_CODE_GENERATED$)
+if (H5_BAD_LOG2_CODE_GENERATED MATCHES ^H5_BAD_LOG2_CODE_GENERATED$)
+  set (H5_BAD_LOG2_CODE_GENERATED 0 CACHE INTERNAL "Define if your system generates wrong code for log2 routine")
+  message (STATUS "Checking IF your system generates wrong code for log2 routine... no")
+endif (H5_BAD_LOG2_CODE_GENERATED MATCHES ^H5_BAD_LOG2_CODE_GENERATED$)
 # ----------------------------------------------------------------------
 # Check if pointer alignments are enforced
 #
@@ -1202,21 +1173,21 @@ H5ConversionTests (H5_NO_ALIGNMENT_RESTRICTIONS "Checking IF alignment restricti
 
 # Define a macro for Cygwin (on XP only) where the compiler has rounding
 #   problem converting from unsigned long long to long double */
-IF (CYGWIN)
-  SET (H5_CYGWIN_ULLONG_TO_LDOUBLE_ROUND_PROBLEM 1)
-ENDIF (CYGWIN)
+if (CYGWIN)
+  set (H5_CYGWIN_ULLONG_TO_LDOUBLE_ROUND_PROBLEM 1)
+endif (CYGWIN)
 
 # -----------------------------------------------------------------------
 # wrapper script variables
 # 
-SET (prefix ${CMAKE_INSTALL_PREFIX})
-SET (exec_prefix "\${prefix}")
-SET (libdir "${exec_prefix}/lib")
-SET (includedir "\${prefix}/include")
-SET (host_os ${CMAKE_HOST_SYSTEM_NAME})
-SET (CC ${CMAKE_C_COMPILER})
-SET (CXX ${CMAKE_CXX_COMPILER})
-SET (FC ${CMAKE_Fortran_COMPILER})
-FOREACH (LINK_LIB ${LINK_LIBS})
-  SET (LIBS "${LIBS} -l${LINK_LIB}")
-ENDFOREACH (LINK_LIB ${LINK_LIBS})
+set (prefix ${CMAKE_INSTALL_PREFIX})
+set (exec_prefix "\${prefix}")
+set (libdir "${exec_prefix}/lib")
+set (includedir "\${prefix}/include")
+set (host_os ${CMAKE_HOST_SYSTEM_NAME})
+set (CC ${CMAKE_C_COMPILER})
+set (CXX ${CMAKE_CXX_COMPILER})
+set (FC ${CMAKE_Fortran_COMPILER})
+foreach (LINK_LIB ${LINK_LIBS})
+  set (LIBS "${LIBS} -l${LINK_LIB}")
+endforeach (LINK_LIB ${LINK_LIBS})
diff --git a/config/cmake/FindHDF5.cmake.in b/config/cmake/FindHDF5.cmake.in
index 1b51ed4..0ac8bc9 100644
--- a/config/cmake/FindHDF5.cmake.in
+++ b/config/cmake/FindHDF5.cmake.in
@@ -38,18 +38,18 @@
 # To aid in finding HDF5 as part of a subproject set

 # HDF5_ROOT_DIR_HINT to the location where @HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake lies

 

-INCLUDE (SelectLibraryConfigurations)

-INCLUDE (FindPackageHandleStandardArgs)

+include (SelectLibraryConfigurations)

+include (FindPackageHandleStandardArgs)

 

 # The HINTS option should only be used for values computed from the system.

-SET (_HDF5_HINTS

+set (_HDF5_HINTS

     $ENV{HOME}/.local

     $ENV{HDF5_ROOT}

     $ENV{HDF5_ROOT_DIR_HINT}

 )

 # Hard-coded guesses should still go in PATHS. This ensures that the user

 # environment can always override hard guesses.

-SET (_HDF5_PATHS

+set (_HDF5_PATHS

     $ENV{HOME}/.local

     $ENV{HDF5_ROOT}

     $ENV{HDF5_ROOT_DIR_HINT}

@@ -78,9 +78,9 @@ FIND_PATH (HDF5_INCLUDE_DIRS "H5public.h"
 

 # For backwards compatibility we set HDF5_INCLUDE_DIR to the value of

 # HDF5_INCLUDE_DIRS

-SET ( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )

+set ( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )

 

-IF (HDF5_INCLUDE_DIR)

-  SET (HDF5_FOUND "YES")

-  INCLUDE (${HDF5_ROOT_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake)

-ENDIF (HDF5_INCLUDE_DIR)

+if (HDF5_INCLUDE_DIR)

+  set (HDF5_FOUND "YES")

+  include (${HDF5_ROOT_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake)

+endif (HDF5_INCLUDE_DIR)

diff --git a/config/cmake/FindMPI.cmake b/config/cmake/FindMPI.cmake
index b16c9c3..1b67a30 100644
--- a/config/cmake/FindMPI.cmake
+++ b/config/cmake/FindMPI.cmake
@@ -86,7 +86,7 @@ include(GetPrerequisites)
 #
 # The compilers are detected in this order:
 #
-# 1. Try to find the most generic availble MPI compiler, as this is usually set up by
+# 1. Try to find the most generic available MPI compiler, as this is usually set up by
 #    cluster admins.  e.g., if plain old mpicc is available, we'll use it and assume it's
 #    the right compiler.
 #
@@ -354,6 +354,20 @@ function (interrogate_mpi_compiler lang try_libs)
         # Extract the set of libraries to link against from the link command
         # line
         string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
+        # add the compiler implicit directories because some compilers
+        # such as the intel compiler have libraries that show up
+        # in the showme list that can only be found in the implicit
+        # link directories of the compiler. Do this for C++ and C
+        # compilers if the implicit link directories are defined.
+        if (DEFINED CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES)
+          set(MPI_LINK_PATH
+            "${MPI_LINK_PATH};${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}")
+        endif ()
+
+        if (DEFINED CMAKE_C_IMPLICIT_LINK_DIRECTORIES)
+          set(MPI_LINK_PATH
+            "${MPI_LINK_PATH};${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
+        endif ()
 
         # Determine full path names for all of the libraries that one needs
         # to link against in an MPI program
@@ -413,18 +427,18 @@ function (interrogate_mpi_compiler lang try_libs)
           HINTS         ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
           PATH_SUFFIXES lib)
         if (MPI_LIBRARIES_WORK AND MPI_LIB)
-          set(MPI_LIBRARIES_WORK ${MPI_LIBRARIES_WORK} ${MPI_LIB})
+          list(APPEND MPI_LIBRARIES_WORK ${MPI_LIB})
         endif()
       endif()
 
       if (${lang} STREQUAL Fortran)
         set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
         find_library(MPI_LIB
-          NAMES         fmpi fmpich fmpich2 fmpich2g
+          NAMES         fmpi fmpich fmpich2 fmpich2g msmpifec msmpifmc
           HINTS         ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
-          PATH_SUFFIXES lib)
+          PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR})
         if (MPI_LIBRARIES_WORK AND MPI_LIB)
-          set(MPI_LIBRARIES_WORK ${MPI_LIBRARIES_WORK} ${MPI_LIB})
+          list(APPEND MPI_LIBRARIES_WORK ${MPI_LIB})
         endif()
       endif()
 
@@ -573,6 +587,11 @@ foreach (lang C CXX Fortran)
       try_regular_compiler(${lang} regular_compiler_worked)
     endif()
 
+    set(MPI_${lang}_FIND_QUIETLY ${MPI_FIND_QUIETLY})
+    set(MPI_${lang}_FIND_REQUIRED ${MPI_FIND_REQUIRED})
+    set(MPI_${lang}_FIND_VERSION ${MPI_FIND_VERSION})
+    set(MPI_${lang}_FIND_VERSION_EXACT ${MPI_FIND_VERSION_EXACT})
+
     if (regular_compiler_worked)
       find_package_handle_standard_args(MPI_${lang} DEFAULT_MSG MPI_${lang}_COMPILER)
     else()
diff --git a/config/cmake/FindSZIP.cmake b/config/cmake/FindSZIP.cmake
index b358862..f657cfa 100644
--- a/config/cmake/FindSZIP.cmake
+++ b/config/cmake/FindSZIP.cmake
@@ -11,7 +11,7 @@
 #  SZIP_LIBRARY_DEBUG - Debug version of SZIP library
 #  SZIP_LIBRARY_RELEASE - Release Version of SZIP library
 
-# MESSAGE (STATUS "Finding SZIP library and headers..." )
+# message (STATUS "Finding SZIP library and headers..." )
 
 ############################################
 #
@@ -25,41 +25,41 @@
 #########################################################################
 
 MACRO (SZIP_ADJUST_LIB_VARS basename)
-  IF (${basename}_INCLUDE_DIR)
+  if (${basename}_INCLUDE_DIR)
 
     # if only the release version was found, set the debug variable also to the release version
-    IF (${basename}_LIBRARY_RELEASE AND NOT ${basename}_LIBRARY_DEBUG)
-      SET (${basename}_LIBRARY_DEBUG ${${basename}_LIBRARY_RELEASE})
-      SET (${basename}_LIBRARY       ${${basename}_LIBRARY_RELEASE})
-      SET (${basename}_LIBRARIES     ${${basename}_LIBRARY_RELEASE})
-    ENDIF (${basename}_LIBRARY_RELEASE AND NOT ${basename}_LIBRARY_DEBUG)
+    if (${basename}_LIBRARY_RELEASE AND NOT ${basename}_LIBRARY_DEBUG)
+      set (${basename}_LIBRARY_DEBUG ${${basename}_LIBRARY_RELEASE})
+      set (${basename}_LIBRARY       ${${basename}_LIBRARY_RELEASE})
+      set (${basename}_LIBRARIES     ${${basename}_LIBRARY_RELEASE})
+    endif (${basename}_LIBRARY_RELEASE AND NOT ${basename}_LIBRARY_DEBUG)
 
     # if only the debug version was found, set the release variable also to the debug version
-    IF (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE)
-      SET (${basename}_LIBRARY_RELEASE ${${basename}_LIBRARY_DEBUG})
-      SET (${basename}_LIBRARY         ${${basename}_LIBRARY_DEBUG})
-      SET (${basename}_LIBRARIES       ${${basename}_LIBRARY_DEBUG})
-    ENDIF (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE)
-    IF (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE)
+    if (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE)
+      set (${basename}_LIBRARY_RELEASE ${${basename}_LIBRARY_DEBUG})
+      set (${basename}_LIBRARY         ${${basename}_LIBRARY_DEBUG})
+      set (${basename}_LIBRARIES       ${${basename}_LIBRARY_DEBUG})
+    endif (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE)
+    if (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE)
       # if the generator supports configuration types then set
       # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
-      IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET (${basename}_LIBRARY       optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
+      if (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        set (${basename}_LIBRARY       optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
       ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
         # if there are no configuration types and CMAKE_BUILD_TYPE has no value
         # then just use the release libraries
-        SET (${basename}_LIBRARY       ${${basename}_LIBRARY_RELEASE} )
-      ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET (${basename}_LIBRARIES       optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
-    ENDIF (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE)
+        set (${basename}_LIBRARY       ${${basename}_LIBRARY_RELEASE} )
+      endif (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+      set (${basename}_LIBRARIES       optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
+    endif (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE)
 
-    SET (${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH "The ${basename} library")
+    set (${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH "The ${basename} library")
 
-    IF (${basename}_LIBRARY)
-      SET (${basename}_FOUND 1)
-    ENDIF (${basename}_LIBRARY)
+    if (${basename}_LIBRARY)
+      set (${basename}_FOUND 1)
+    endif (${basename}_LIBRARY)
 
-  ENDIF (${basename}_INCLUDE_DIR )
+  endif (${basename}_INCLUDE_DIR )
 
   # Make variables changeble to the advanced user
   MARK_AS_ADVANCED (${basename}_LIBRARY ${basename}_LIBRARY_RELEASE ${basename}_LIBRARY_DEBUG ${basename}_INCLUDE_DIR )
@@ -67,19 +67,19 @@ ENDMACRO (SZIP_ADJUST_LIB_VARS)
 
 
 # Look for the header file.
-SET (SZIP_INCLUDE_SEARCH_DIRS
+set (SZIP_INCLUDE_SEARCH_DIRS
     $ENV{SZIP_INSTALL}/include
     $ENV{SZIP_INSTALL}/include/szip
     /usr/include
     /usr/include/szip
 )
 
-SET (SZIP_LIB_SEARCH_DIRS
+set (SZIP_LIB_SEARCH_DIRS
     $ENV{SZIP_INSTALL}/lib
     /usr/lib
 )
 
-SET (SZIP_BIN_SEARCH_DIRS
+set (SZIP_BIN_SEARCH_DIRS
     $ENV{SZIP_INSTALL}/bin
     /usr/bin
 )
@@ -90,13 +90,13 @@ FIND_PATH (SZIP_INCLUDE_DIR
     NO_DEFAULT_PATH
 )
 
-IF (WIN32)
-    SET (SZIP_SEARCH_DEBUG_NAMES "sz_d;libsz_d")
-    SET (SZIP_SEARCH_RELEASE_NAMES "sz;libsz;libszip")
-ELSE (WIN32)
-    SET (SZIP_SEARCH_DEBUG_NAMES "sz_d")
-    SET (SZIP_SEARCH_RELEASE_NAMES "sz;szip")
-ENDIF (WIN32)
+if (WIN32)
+    set (SZIP_SEARCH_DEBUG_NAMES "sz_d;libsz_d")
+    set (SZIP_SEARCH_RELEASE_NAMES "sz;libsz;libszip")
+else (WIN32)
+    set (SZIP_SEARCH_DEBUG_NAMES "sz_d")
+    set (SZIP_SEARCH_RELEASE_NAMES "sz;szip")
+endif (WIN32)
 
 # Look for the library.
 FIND_LIBRARY (SZIP_LIBRARY_DEBUG
@@ -113,67 +113,67 @@ FIND_LIBRARY (SZIP_LIBRARY_RELEASE
 
 SZIP_ADJUST_LIB_VARS (SZIP)
 
-IF (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
-  SET (SZIP_FOUND 1)
-  SET (SZIP_LIBRARIES ${SZIP_LIBRARY})
-  SET (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR})
-  IF (SZIP_LIBRARY_DEBUG)
+if (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
+  set (SZIP_FOUND 1)
+  set (SZIP_LIBRARIES ${SZIP_LIBRARY})
+  set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR})
+  if (SZIP_LIBRARY_DEBUG)
     GET_FILENAME_COMPONENT (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_DEBUG} PATH)
-    SET (SZIP_LIB_DIR  ${SZIP_LIBRARY_PATH})
-  ELSEIF (SZIP_LIBRARY_RELEASE)
+    set (SZIP_LIB_DIR  ${SZIP_LIBRARY_PATH})
+  elseif (SZIP_LIBRARY_RELEASE)
     GET_FILENAME_COMPONENT (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_RELEASE} PATH)
-    SET (SZIP_LIB_DIR  ${SZIP_LIBRARY_PATH})
-  ENDIF (SZIP_LIBRARY_DEBUG)
+    set (SZIP_LIB_DIR  ${SZIP_LIBRARY_PATH})
+  endif (SZIP_LIBRARY_DEBUG)
 
-ELSE (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
-  SET (SZIP_FOUND 0)
-  SET (SZIP_LIBRARIES)
-  SET (SZIP_INCLUDE_DIRS)
-ENDIF (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
+else (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
+  set (SZIP_FOUND 0)
+  set (SZIP_LIBRARIES)
+  set (SZIP_INCLUDE_DIRS)
+endif (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
 
 # Report the results.
-IF (NOT SZIP_FOUND)
-  SET (SZIP_DIR_MESSAGE
+if (NOT SZIP_FOUND)
+  set (SZIP_DIR_MESSAGE
       "SZip was not found. Make sure SZIP_LIBRARY and SZIP_INCLUDE_DIR are set or set the SZIP_INSTALL environment variable."
   )
-  IF (NOT SZIP_FIND_QUIETLY)
-    MESSAGE (STATUS "${SZIP_DIR_MESSAGE}")
-  ELSE (NOT SZIP_FIND_QUIETLY)
-    IF (SZIP_FIND_REQUIRED)
-      MESSAGE (FATAL_ERROR "SZip was NOT found and is Required by this project")
-    ENDIF (SZIP_FIND_REQUIRED)
-  ENDIF (NOT SZIP_FIND_QUIETLY)
-ENDIF (NOT SZIP_FOUND)
-
-IF (SZIP_FOUND)
-  INCLUDE (CheckSymbolExists)
+  if (NOT SZIP_FIND_QUIETLY)
+    message (STATUS "${SZIP_DIR_MESSAGE}")
+  else (NOT SZIP_FIND_QUIETLY)
+    if (SZIP_FIND_REQUIRED)
+      message (FATAL_ERROR "SZip was NOT found and is Required by this project")
+    endif (SZIP_FIND_REQUIRED)
+  endif (NOT SZIP_FIND_QUIETLY)
+endif (NOT SZIP_FOUND)
+
+if (SZIP_FOUND)
+  include (CheckSymbolExists)
   #############################################
   # Find out if SZIP was build using dll's
   #############################################
   # Save required variable
-  SET (CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
-  SET (CMAKE_REQUIRED_FLAGS_SAVE    ${CMAKE_REQUIRED_FLAGS})
+  set (CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
+  set (CMAKE_REQUIRED_FLAGS_SAVE    ${CMAKE_REQUIRED_FLAGS})
   # Add SZIP_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
-  SET (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${SZIP_INCLUDE_DIRS}")
+  set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${SZIP_INCLUDE_DIRS}")
 
   CHECK_SYMBOL_EXISTS (SZIP_BUILT_AS_DYNAMIC_LIB "SZconfig.h" HAVE_SZIP_DLL)
 
-  IF (HAVE_SZIP_DLL STREQUAL "TRUE")
-    SET (HAVE_SZIP_DLL "1")
-  ENDIF (HAVE_SZIP_DLL STREQUAL "TRUE")
+  if (HAVE_SZIP_DLL STREQUAL "TRUE")
+    set (HAVE_SZIP_DLL "1")
+  endif (HAVE_SZIP_DLL STREQUAL "TRUE")
 
   # Restore CMAKE_REQUIRED_INCLUDES and CMAKE_REQUIRED_FLAGS variables
-  SET (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
-  SET (CMAKE_REQUIRED_FLAGS    ${CMAKE_REQUIRED_FLAGS_SAVE})
+  set (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
+  set (CMAKE_REQUIRED_FLAGS    ${CMAKE_REQUIRED_FLAGS_SAVE})
   #
   #############################################
-ENDIF (SZIP_FOUND)
-
-IF (FIND_SZIP_DEBUG)
-  MESSAGE (STATUS "SZIP_INCLUDE_DIR: ${SZIP_INCLUDE_DIR}")
-  MESSAGE (STATUS "SZIP_INCLUDE_DIRS: ${SZIP_INCLUDE_DIRS}")
-  MESSAGE (STATUS "SZIP_LIBRARY_DEBUG: ${SZIP_LIBRARY_DEBUG}")
-  MESSAGE (STATUS "SZIP_LIBRARY_RELEASE: ${SZIP_LIBRARY_RELEASE}")
-  MESSAGE (STATUS "HAVE_SZIP_DLL: ${HAVE_SZIP_DLL}")
-  MESSAGE (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-ENDIF (FIND_SZIP_DEBUG)
+endif (SZIP_FOUND)
+
+if (FIND_SZIP_DEBUG)
+  message (STATUS "SZIP_INCLUDE_DIR: ${SZIP_INCLUDE_DIR}")
+  message (STATUS "SZIP_INCLUDE_DIRS: ${SZIP_INCLUDE_DIRS}")
+  message (STATUS "SZIP_LIBRARY_DEBUG: ${SZIP_LIBRARY_DEBUG}")
+  message (STATUS "SZIP_LIBRARY_RELEASE: ${SZIP_LIBRARY_RELEASE}")
+  message (STATUS "HAVE_SZIP_DLL: ${HAVE_SZIP_DLL}")
+  message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+endif (FIND_SZIP_DEBUG)
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 53336ed..026934e 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -220,12 +220,6 @@
 /* Define to 1 if you have the `get_fpc_csr' function. */
 #cmakedefine H5_HAVE_GET_FPC_CSR @H5_HAVE_GET_FPC_CSR@
 
-/* Define if we have GPFS support */
-#cmakedefine H5_HAVE_GPFS @H5_HAVE_GPFS@
-
-/* Define to 1 if you have the <gpfs.h> header file. */
-#cmakedefine H5_HAVE_GPFS_H @H5_HAVE_GPFS_H@
-
 /* Define if library will contain instrumentation to detect correct
    optimization operation */
 #cmakedefine H5_HAVE_INSTRUMENTED_LIBRARY @H5_HAVE_INSTRUMENTED_LIBRARY@
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 3e6ee18..d0379db 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -1,31 +1,31 @@
 #-------------------------------------------------------------------------------
 MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
-  SET (LIB_OUT_NAME "${libname}")
-  IF (${libtype} MATCHES "SHARED")
-    IF (WIN32)
-      SET (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION_MAJOR})
-    ELSE (WIN32)
-      SET (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION})
-    ENDIF (WIN32)
-    SET_TARGET_PROPERTIES (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION})
-    IF (WIN32)
-        SET (${LIB_OUT_NAME} "${LIB_OUT_NAME}-${HDF5_PACKAGE_SOVERSION}")
-    ELSE (WIN32)
-        SET_TARGET_PROPERTIES (${libtarget} PROPERTIES SOVERSION ${HDF5_PACKAGE_SOVERSION})
-    ENDIF (WIN32)
-  ENDIF (${libtype} MATCHES "SHARED")
+  set (LIB_OUT_NAME "${libname}")
+  if (${libtype} MATCHES "SHARED")
+    if (WIN32)
+      set (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION_MAJOR})
+    else (WIN32)
+      set (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION})
+    endif (WIN32)
+    set_target_properties (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION})
+    if (WIN32)
+        set (${LIB_OUT_NAME} "${LIB_OUT_NAME}-${HDF5_PACKAGE_SOVERSION}")
+    else (WIN32)
+        set_target_properties (${libtarget} PROPERTIES SOVERSION ${HDF5_PACKAGE_SOVERSION})
+    endif (WIN32)
+  endif (${libtype} MATCHES "SHARED")
   HDF_SET_LIB_OPTIONS (${libtarget} ${LIB_OUT_NAME} ${libtype})
 
   #-- Apple Specific install_name for libraries
-  IF (APPLE)
-    OPTION (HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF)
-    IF (HDF5_BUILD_WITH_INSTALL_NAME)
+  if (APPLE)
+    option (HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF)
+    if (HDF5_BUILD_WITH_INSTALL_NAME)
       SET_TARGET_PROPERTIES(${libtarget} PROPERTIES
           LINK_FLAGS "-current_version ${HDF5_PACKAGE_VERSION} -compatibility_version ${HDF5_PACKAGE_VERSION}"
           INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
           BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME}
       )
-    ENDIF (HDF5_BUILD_WITH_INSTALL_NAME)
-  ENDIF (APPLE)
+    endif (HDF5_BUILD_WITH_INSTALL_NAME)
+  endif (APPLE)
 
 ENDMACRO (H5_SET_LIB_OPTIONS)
diff --git a/config/cmake/HDF5Tests.c b/config/cmake/HDF5Tests.c
index 21206e0..355c06f 100644
--- a/config/cmake/HDF5Tests.c
+++ b/config/cmake/HDF5Tests.c
@@ -437,17 +437,6 @@ main ()
 
 #endif
 
-#ifdef HAVE_GPFS
-
-#include <gpfs.h>
-int main ()
-{
-    int fd = 0; 
-    gpfs_fcntl(fd, (void *)0);
-}
-
-#endif /* HAVE_GPFS */
-
 #ifdef HAVE_IOEO
 
 #include <windows.h>
diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake
index 8fa76b8..e65ea21 100644
--- a/config/cmake/HDF5UseFortran.cmake
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -7,7 +7,7 @@ ENABLE_LANGUAGE (Fortran)
 #-----------------------------------------------------------------------------
 # Detect name mangling convention used between Fortran and C
 #-----------------------------------------------------------------------------
-INCLUDE (FortranCInterface)
+include (FortranCInterface)
 FortranCInterface_HEADER (
     ${CMAKE_BINARY_DIR}/FCMangle.h
     MACRO_NAMESPACE "H5_FC_"
@@ -15,28 +15,28 @@ FortranCInterface_HEADER (
     SYMBOLS mysub mymod:my_sub
 )
 
-FILE (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL\\(.*,.*\\) +(.*)")
-STRING (REGEX MATCH "H5_FC_GLOBAL\\(.*,.*\\) +(.*)" RESULT ${CONTENTS})
-SET (H5_FC_FUNC "H5_FC_FUNC(name,NAME) ${CMAKE_MATCH_1}")
+file (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL\\(.*,.*\\) +(.*)")
+string (REGEX MATCH "H5_FC_GLOBAL\\(.*,.*\\) +(.*)" RESULT ${CONTENTS})
+set (H5_FC_FUNC "H5_FC_FUNC(name,NAME) ${CMAKE_MATCH_1}")
 
-FILE (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)")
-STRING (REGEX MATCH "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)" RESULT ${CONTENTS})
-SET (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) ${CMAKE_MATCH_1}")
+file (STRINGS ${CMAKE_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)")
+string (REGEX MATCH "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)" RESULT ${CONTENTS})
+set (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) ${CMAKE_MATCH_1}")
 
 #-----------------------------------------------------------------------------
 # The provided CMake Fortran macros don't provide a general check function
 # so this one is used for a sizeof test.
 #-----------------------------------------------------------------------------
 MACRO (CHECK_FORTRAN_FEATURE FUNCTION CODE VARIABLE)
-  IF (NOT DEFINED ${VARIABLE})
-    MESSAGE (STATUS "Testing Fortran ${FUNCTION}")
-    IF (CMAKE_REQUIRED_LIBRARIES)
-      SET (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES
+  if (NOT DEFINED ${VARIABLE})
+    message (STATUS "Testing Fortran ${FUNCTION}")
+    if (CMAKE_REQUIRED_LIBRARIES)
+      set (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES
           "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
-    ELSE (CMAKE_REQUIRED_LIBRARIES)
-      SET (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES)
-    ENDIF (CMAKE_REQUIRED_LIBRARIES)
-    FILE (WRITE
+    else (CMAKE_REQUIRED_LIBRARIES)
+      set (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES)
+    endif (CMAKE_REQUIRED_LIBRARIES)
+    file (WRITE
         ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f
         "${CODE}"
     )
@@ -47,25 +47,25 @@ MACRO (CHECK_FORTRAN_FEATURE FUNCTION CODE VARIABLE)
         OUTPUT_VARIABLE OUTPUT
     )
 
-#    MESSAGE ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
-#    MESSAGE ( "Test result ${OUTPUT}")
-#    MESSAGE ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+#    message ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
+#    message ( "Test result ${OUTPUT}")
+#    message ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ")
 
-    IF (${VARIABLE})
-      SET (${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}")
-      MESSAGE (STATUS "Testing Fortran ${FUNCTION} - OK")
-      FILE (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+    if (${VARIABLE})
+      set (${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}")
+      message (STATUS "Testing Fortran ${FUNCTION} - OK")
+      file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
           "Determining if the Fortran ${FUNCTION} exists passed with the following output:\n"
           "${OUTPUT}\n\n"
       )
-    ELSE (${VARIABLE})
-      MESSAGE (STATUS "Testing Fortran ${FUNCTION} - Fail")
-      SET (${VARIABLE} "" CACHE INTERNAL "Have Fortran function ${FUNCTION}")
-      FILE (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+    else (${VARIABLE})
+      message (STATUS "Testing Fortran ${FUNCTION} - Fail")
+      set (${VARIABLE} "" CACHE INTERNAL "Have Fortran function ${FUNCTION}")
+      file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Determining if the Fortran ${FUNCTION} exists failed with the following output:\n"
           "${OUTPUT}\n\n")
-    ENDIF (${VARIABLE})
-  ENDIF (NOT DEFINED ${VARIABLE})
+    endif (${VARIABLE})
+  endif (NOT DEFINED ${VARIABLE})
 ENDMACRO (CHECK_FORTRAN_FEATURE)
 
 #-----------------------------------------------------------------------------
@@ -131,9 +131,9 @@ CHECK_FORTRAN_FEATURE(iso_c_binding
 #-----------------------------------------------------------------------------
 # Add debug information (intel Fortran : JB)
 #-----------------------------------------------------------------------------
-IF (CMAKE_Fortran_COMPILER MATCHES ifort)
-    IF (WIN32)
-        SET (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE)
-        SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE)
-    ENDIF (WIN32)
-ENDIF (CMAKE_Fortran_COMPILER MATCHES ifort)
+if (CMAKE_Fortran_COMPILER MATCHES ifort)
+    if (WIN32)
+        set (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE)
+        set (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE)
+    endif (WIN32)
+endif (CMAKE_Fortran_COMPILER MATCHES ifort)
diff --git a/config/cmake/HDFLibMacros.cmake b/config/cmake/HDFLibMacros.cmake
index 57e6be7..505a9d5 100644
--- a/config/cmake/HDFLibMacros.cmake
+++ b/config/cmake/HDFLibMacros.cmake
@@ -3,7 +3,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type libtype jpeg_pic)
   # May need to build JPEG with PIC on x64 machines with gcc
   # Need to use CMAKE_ANSI_CFLAGS define so that compiler test works
 
-  IF (${compress_type} MATCHES "SVN")
+  if (${compress_type} MATCHES "SVN")
     EXTERNALPROJECT_ADD (JPEG
         SVN_REPOSITORY ${JPEG_URL}
         # [SVN_REVISION rev] 
@@ -19,7 +19,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type libtype jpeg_pic)
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
             -DCMAKE_ANSI_CFLAGS:STRING=${jpeg_pic}
     ) 
-  ELSEIF (${compress_type} MATCHES "TGZ")
+  elseif (${compress_type} MATCHES "TGZ")
     EXTERNALPROJECT_ADD (JPEG
         URL ${JPEG_URL}
         URL_MD5 ""
@@ -35,72 +35,72 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type libtype jpeg_pic)
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
             -DCMAKE_ANSI_CFLAGS:STRING=${jpeg_pic}
     ) 
-  ENDIF (${compress_type} MATCHES "SVN")
+  endif (${compress_type} MATCHES "SVN")
   EXTERNALPROJECT_GET_PROPERTY (JPEG BINARY_DIR SOURCE_DIR) 
 
-  IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    IF (WIN32)
-      SET (JPEG_LIB_NAME "jpeg_D")
-    ELSE (WIN32)
-      SET (JPEG_LIB_NAME "jpeg_debug")
-    ENDIF (WIN32)
-  ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    SET (JPEG_LIB_NAME "jpeg")
-  ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+  if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+    if (WIN32)
+      set (JPEG_LIB_NAME "jpeg_D")
+    else (WIN32)
+      set (JPEG_LIB_NAME "jpeg_debug")
+    endif (WIN32)
+  else (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+    set (JPEG_LIB_NAME "jpeg")
+  endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
   # Create imported target szip
   ADD_LIBRARY(jpeg ${libtype} IMPORTED)
   ADD_DEPENDENCIES (jpeg JPEG)
 
-  IF (${libtype} MATCHES "SHARED")
-    IF (WIN32)
-      IF (MINGW)
+  if (${libtype} MATCHES "SHARED")
+    if (WIN32)
+      if (MINGW)
         SET_TARGET_PROPERTIES(jpeg PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${JPEG_LIB_NAME}.lib"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ELSE (MINGW)
+      else (MINGW)
         SET_TARGET_PROPERTIES(jpeg PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ENDIF (MINGW)
-    ELSE (WIN32)
-      IF (CYGWIN)
+      endif (MINGW)
+    else (WIN32)
+      if (CYGWIN)
         SET_TARGET_PROPERTIES(jpeg PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ELSE (CYGWIN)
+      else (CYGWIN)
         SET_TARGET_PROPERTIES(jpeg PROPERTIES
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
             IMPORTED_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${JPEG_VERSION_STRING}"
             SOVERSION "${JPEG_VERSION_STRING}"
         )
-      ENDIF (CYGWIN)
-    ENDIF (WIN32)
-  ELSE (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
+      endif (CYGWIN)
+    endif (WIN32)
+  else (${libtype} MATCHES "SHARED")
+    if (WIN32 AND NOT MINGW)
       SET_TARGET_PROPERTIES(jpeg PROPERTIES
           IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/lib${JPEG_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       )
-    ELSE (WIN32 AND NOT MINGW)
+    else (WIN32 AND NOT MINGW)
       SET_TARGET_PROPERTIES(jpeg PROPERTIES
           IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${JPEG_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       )
-    ENDIF (WIN32 AND NOT MINGW)
-  ENDIF (${libtype} MATCHES "SHARED")
+    endif (WIN32 AND NOT MINGW)
+  endif (${libtype} MATCHES "SHARED")
 
-#  INCLUDE (${BINARY_DIR}/JPEG-targets.cmake)  
-  SET (JPEG_LIBRARY "jpeg")
+#  include (${BINARY_DIR}/JPEG-targets.cmake)  
+  set (JPEG_LIBRARY "jpeg")
   
-  SET (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}")
-  SET (JPEG_INCLUDE_DIR "${SOURCE_DIR}/src")
-  SET (JPEG_FOUND 1)
-  SET (JPEG_LIBRARIES ${JPEG_LIBRARY})
-  SET (JPEG_INCLUDE_DIRS ${JPEG_INCLUDE_DIR_GEN} ${JPEG_INCLUDE_DIR})
+  set (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  set (JPEG_INCLUDE_DIR "${SOURCE_DIR}/src")
+  set (JPEG_FOUND 1)
+  set (JPEG_LIBRARIES ${JPEG_LIBRARY})
+  set (JPEG_INCLUDE_DIRS ${JPEG_INCLUDE_DIR_GEN} ${JPEG_INCLUDE_DIR})
 ENDMACRO (EXTERNAL_JPEG_LIBRARY)
 
 #-------------------------------------------------------------------------------
@@ -109,15 +109,15 @@ MACRO (PACKAGE_JPEG_LIBRARY compress_type)
       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${JPEG_INCLUDE_DIR_GEN}/jconfig.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
       COMMENT "Copying ${JPEG_INCLUDE_DIR_GEN}/jconfig.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
   )
-  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/jconfig.h)
-  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+  set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/jconfig.h)
+  if (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
     ADD_DEPENDENCIES (JPEG-GenHeader-Copy JPEG)
-  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+  endif (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
 ENDMACRO (PACKAGE_JPEG_LIBRARY)
 
 #-------------------------------------------------------------------------------
 MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
-  IF (${compress_type} MATCHES "SVN")
+  if (${compress_type} MATCHES "SVN")
     EXTERNALPROJECT_ADD (SZIP
         SVN_REPOSITORY ${SZIP_URL}
         # [SVN_REVISION rev] 
@@ -134,7 +134,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
             -DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
             -DSZIP_ENABLE_ENCODING:BOOL=${encoding}
     ) 
-  ELSEIF (${compress_type} MATCHES "TGZ")
+  elseif (${compress_type} MATCHES "TGZ")
     EXTERNALPROJECT_ADD (SZIP
         URL ${SZIP_URL}
         URL_MD5 ""
@@ -151,72 +151,72 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
             -DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
             -DSZIP_ENABLE_ENCODING:BOOL=${encoding}
     ) 
-  ENDIF (${compress_type} MATCHES "SVN")
+  endif (${compress_type} MATCHES "SVN")
   EXTERNALPROJECT_GET_PROPERTY (SZIP BINARY_DIR SOURCE_DIR) 
 
-  IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    IF (WIN32)
-      SET (SZIP_LIB_NAME "szip_D")
-    ELSE (WIN32)
-      SET (SZIP_LIB_NAME "szip_debug")
-    ENDIF (WIN32)
-  ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    SET (SZIP_LIB_NAME "szip")
-  ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+  if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+    if (WIN32)
+      set (SZIP_LIB_NAME "szip_D")
+    else (WIN32)
+      set (SZIP_LIB_NAME "szip_debug")
+    endif (WIN32)
+  else (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+    set (SZIP_LIB_NAME "szip")
+  endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
   # Create imported target szip
   ADD_LIBRARY(szip ${libtype} IMPORTED)
   ADD_DEPENDENCIES (szip SZIP)
 
-  IF (${libtype} MATCHES "SHARED")
-    IF (WIN32)
-      IF (MINGW)
+  if (${libtype} MATCHES "SHARED")
+    if (WIN32)
+      if (MINGW)
         SET_TARGET_PROPERTIES(szip PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SZIP_LIB_NAME}.lib"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ELSE (MINGW)
+      else (MINGW)
         SET_TARGET_PROPERTIES(szip PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ENDIF (MINGW)
-    ELSE (WIN32)
-      IF (CYGWIN)
+      endif (MINGW)
+    else (WIN32)
+      if (CYGWIN)
         SET_TARGET_PROPERTIES(szip PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ELSE (CYGWIN)
+      else (CYGWIN)
         SET_TARGET_PROPERTIES(szip PROPERTIES
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
             IMPORTED_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${SZIP_VERSION_STRING}"
             SOVERSION "${SZIP_VERSION_STRING}"
         )
-      ENDIF (CYGWIN)
-    ENDIF (WIN32)
-  ELSE (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
+      endif (CYGWIN)
+    endif (WIN32)
+  else (${libtype} MATCHES "SHARED")
+    if (WIN32 AND NOT MINGW)
       SET_TARGET_PROPERTIES(szip PROPERTIES
           IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/lib${SZIP_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       )
-    ELSE (WIN32 AND NOT MINGW)
+    else (WIN32 AND NOT MINGW)
       SET_TARGET_PROPERTIES(szip PROPERTIES
           IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${SZIP_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       )
-    ENDIF (WIN32 AND NOT MINGW)
-  ENDIF (${libtype} MATCHES "SHARED")
+    endif (WIN32 AND NOT MINGW)
+  endif (${libtype} MATCHES "SHARED")
 
-#  INCLUDE (${BINARY_DIR}/SZIP-targets.cmake)  
-  SET (SZIP_LIBRARY "szip")
+#  include (${BINARY_DIR}/SZIP-targets.cmake)  
+  set (SZIP_LIBRARY "szip")
 
-  SET (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
-  SET (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
-  SET (SZIP_FOUND 1)
-  SET (SZIP_LIBRARIES ${SZIP_LIBRARY})
-  SET (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR_GEN} ${SZIP_INCLUDE_DIR})
+  set (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  set (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
+  set (SZIP_FOUND 1)
+  set (SZIP_LIBRARIES ${SZIP_LIBRARY})
+  set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR_GEN} ${SZIP_INCLUDE_DIR})
 ENDMACRO (EXTERNAL_SZIP_LIBRARY)
 
 #-------------------------------------------------------------------------------
@@ -225,15 +225,15 @@ MACRO (PACKAGE_SZIP_LIBRARY compress_type)
       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_INCLUDE_DIR_GEN}/SZconfig.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
       COMMENT "Copying ${SZIP_INCLUDE_DIR_GEN}/SZconfig.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
   )
-  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SZconfig.h)
-  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+  set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SZconfig.h)
+  if (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
     ADD_DEPENDENCIES (SZIP-GenHeader-Copy SZIP)
-  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+  endif (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
 ENDMACRO (PACKAGE_SZIP_LIBRARY)
 
 #-------------------------------------------------------------------------------
 MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
-  IF (${compress_type} MATCHES "SVN")
+  if (${compress_type} MATCHES "SVN")
     EXTERNALPROJECT_ADD (ZLIB
         SVN_REPOSITORY ${ZLIB_URL}
         # [SVN_REVISION rev] 
@@ -249,7 +249,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
             -DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
     ) 
-  ELSEIF (${compress_type} MATCHES "TGZ")
+  elseif (${compress_type} MATCHES "TGZ")
     EXTERNALPROJECT_ADD (ZLIB
         URL ${ZLIB_URL}
         URL_MD5 ""
@@ -265,76 +265,76 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
             -DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
     ) 
-  ENDIF (${compress_type} MATCHES "SVN")
+  endif (${compress_type} MATCHES "SVN")
   EXTERNALPROJECT_GET_PROPERTY (ZLIB BINARY_DIR SOURCE_DIR) 
 
-  IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    IF (WIN32)
-      SET (ZLIB_LIB_NAME "zlib_D")
-    ELSE (WIN32)
-      SET (ZLIB_LIB_NAME "z_debug")
-    ENDIF (WIN32)
-  ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    IF (WIN32)
-      SET (ZLIB_LIB_NAME "zlib")
-    ELSE (WIN32)
-      SET (ZLIB_LIB_NAME "z")
-    ENDIF (WIN32)
-  ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+  if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+    if (WIN32)
+      set (ZLIB_LIB_NAME "zlib_D")
+    else (WIN32)
+      set (ZLIB_LIB_NAME "z_debug")
+    endif (WIN32)
+  else (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+    if (WIN32)
+      set (ZLIB_LIB_NAME "zlib")
+    else (WIN32)
+      set (ZLIB_LIB_NAME "z")
+    endif (WIN32)
+  endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
   # Create imported target szip
   ADD_LIBRARY(zlib ${libtype} IMPORTED)
   ADD_DEPENDENCIES (zlib ZLIB)
   
-  IF (${libtype} MATCHES "SHARED")
-    IF (WIN32)
-      IF (MINGW)
+  if (${libtype} MATCHES "SHARED")
+    if (WIN32)
+      if (MINGW)
         SET_TARGET_PROPERTIES(zlib PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ZLIB_LIB_NAME}.lib"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ELSE (MINGW)
+      else (MINGW)
         SET_TARGET_PROPERTIES(zlib PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ENDIF (MINGW)
-    ELSE (WIN32)
-      IF (CYGWIN)
+      endif (MINGW)
+    else (WIN32)
+      if (CYGWIN)
         SET_TARGET_PROPERTIES(zlib PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
-      ELSE (CYGWIN)
+      else (CYGWIN)
         SET_TARGET_PROPERTIES(zlib PROPERTIES
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
             IMPORTED_SONAME "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION_STRING}"
             SOVERSION "${ZLIB_VERSION_STRING}"
         )
-      ENDIF (CYGWIN)
-    ENDIF (WIN32)
-  ELSE (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
+      endif (CYGWIN)
+    endif (WIN32)
+  else (${libtype} MATCHES "SHARED")
+    if (WIN32 AND NOT MINGW)
       SET_TARGET_PROPERTIES(zlib PROPERTIES
           IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/lib${ZLIB_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       )
-    ELSE (WIN32 AND NOT MINGW)
+    else (WIN32 AND NOT MINGW)
       SET_TARGET_PROPERTIES(zlib PROPERTIES
           IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${ZLIB_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       )
-    ENDIF (WIN32 AND NOT MINGW)
-  ENDIF (${libtype} MATCHES "SHARED")
+    endif (WIN32 AND NOT MINGW)
+  endif (${libtype} MATCHES "SHARED")
 
-#  INCLUDE (${BINARY_DIR}/ZLIB-targets.cmake)  
-  SET (ZLIB_LIBRARY "zlib")
+#  include (${BINARY_DIR}/ZLIB-targets.cmake)  
+  set (ZLIB_LIBRARY "zlib")
   
-  SET (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}")
-  SET (ZLIB_INCLUDE_DIR "${SOURCE_DIR}")
-  SET (ZLIB_FOUND 1)
-  SET (ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-  SET (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR_GEN} ${ZLIB_INCLUDE_DIR})
+  set (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  set (ZLIB_INCLUDE_DIR "${SOURCE_DIR}")
+  set (ZLIB_FOUND 1)
+  set (ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+  set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR_GEN} ${ZLIB_INCLUDE_DIR})
 ENDMACRO (EXTERNAL_ZLIB_LIBRARY)
 
 #-------------------------------------------------------------------------------
@@ -343,8 +343,8 @@ MACRO (PACKAGE_ZLIB_LIBRARY compress_type)
       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_INCLUDE_DIR_GEN}/zconf.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
       COMMENT "Copying ${ZLIB_INCLUDE_DIR_GEN}/zconf.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
   )
-  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/zconf.h)
-  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+  set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/zconf.h)
+  if (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
     ADD_DEPENDENCIES (ZLIB-GenHeader-Copy ZLIB)
-  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+  endif (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
 ENDMACRO (PACKAGE_ZLIB_LIBRARY)
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index b0788f2..56fdf83 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -1,52 +1,52 @@
 #-------------------------------------------------------------------------------
 MACRO (SET_GLOBAL_VARIABLE name value)
-  SET (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE)
+  set (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE)
 ENDMACRO (SET_GLOBAL_VARIABLE)
 
 #-------------------------------------------------------------------------------
 MACRO (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
   #set(source_group_path "Source/AIM/${NAME}")
-  STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH})
+  string (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH})
   source_group (${source_group_path} FILES ${HEADERS} ${SOURCES})
 
   #-- The following is needed if we ever start to use OS X Frameworks but only
   #--  works on CMake 2.6 and greater
-  #SET_PROPERTY (SOURCE ${HEADERS}
+  #set_property (SOURCE ${HEADERS}
   #       PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
   #)
 ENDMACRO (IDE_GENERATED_PROPERTIES)
 
 #-------------------------------------------------------------------------------
 MACRO (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
-  #  INSTALL (FILES ${HEADERS}
+  #  install (FILES ${HEADERS}
   #       DESTINATION include/R3D/${NAME}
   #       COMPONENT Headers       
   #  )
 
-  STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH}  )
+  string (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH}  )
   source_group (${source_group_path} FILES ${HEADERS} ${SOURCES})
 
   #-- The following is needed if we ever start to use OS X Frameworks but only
   #--  works on CMake 2.6 and greater
-  #SET_PROPERTY (SOURCE ${HEADERS}
+  #set_property (SOURCE ${HEADERS}
   #       PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
   #)
 ENDMACRO (IDE_SOURCE_PROPERTIES)
 
 #-------------------------------------------------------------------------------
 MACRO (TARGET_NAMING libtarget libtype)
-  IF (WIN32)
-    IF (${libtype} MATCHES "SHARED")
-      SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}dll")
-    ENDIF (${libtype} MATCHES "SHARED")
-  ENDIF (WIN32)
+  if (WIN32)
+    if (${libtype} MATCHES "SHARED")
+      set_target_properties (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}dll")
+    endif (${libtype} MATCHES "SHARED")
+  endif (WIN32)
 ENDMACRO (TARGET_NAMING)
 
 #-------------------------------------------------------------------------------
 MACRO (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
-  IF (WIN32 AND MSVC)
-    GET_TARGET_PROPERTY (target_name ${libtarget} RELWITHDEBINFO_OUTPUT_NAME)
-    INSTALL (
+  if (WIN32 AND MSVC)
+    get_target_property (target_name ${libtarget} RELWITHDEBINFO_OUTPUT_NAME)
+    install (
       FILES
           ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${target_name}.pdb
       DESTINATION
@@ -54,15 +54,15 @@ MACRO (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
       CONFIGURATIONS RelWithDebInfo
       COMPONENT ${targetcomponent}
   )
-  ENDIF (WIN32 AND MSVC)
+  endif (WIN32 AND MSVC)
 ENDMACRO (INSTALL_TARGET_PDB)
 
 #-------------------------------------------------------------------------------
 MACRO (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent)
-  IF (WIN32 AND MSVC)
-    GET_TARGET_PROPERTY (target_name ${progtarget} RELWITHDEBINFO_OUTPUT_NAME)
-    GET_TARGET_PROPERTY (target_prefix ${progtarget} PREFIX)
-    INSTALL (
+  if (WIN32 AND MSVC)
+    get_target_property (target_name ${progtarget} RELWITHDEBINFO_OUTPUT_NAME)
+    get_target_property (target_prefix ${progtarget} PREFIX)
+    install (
       FILES
           ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${target_prefix}${target_name}.pdb
       DESTINATION
@@ -70,37 +70,37 @@ MACRO (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent)
       CONFIGURATIONS RelWithDebInfo
       COMPONENT ${targetcomponent}
   )
-  ENDIF (WIN32 AND MSVC)
+  endif (WIN32 AND MSVC)
 ENDMACRO (INSTALL_PROGRAM_PDB)
 
 #-------------------------------------------------------------------------------
 MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
   # message (STATUS "${libname} libtype: ${libtype}")
-  IF (${libtype} MATCHES "SHARED")
-    IF (WIN32)
-      SET (LIB_RELEASE_NAME "${libname}")
-      SET (LIB_DEBUG_NAME "${libname}_D")
-    ELSE (WIN32)
-      SET (LIB_RELEASE_NAME "${libname}")
-      SET (LIB_DEBUG_NAME "${libname}_debug")
-    ENDIF (WIN32)
-  ELSE (${libtype} MATCHES "SHARED")
-    IF (WIN32)
-      SET (LIB_RELEASE_NAME "lib${libname}")
-      SET (LIB_DEBUG_NAME "lib${libname}_D")
-    ELSE (WIN32)
+  if (${libtype} MATCHES "SHARED")
+    if (WIN32)
+      set (LIB_RELEASE_NAME "${libname}")
+      set (LIB_DEBUG_NAME "${libname}_D")
+    else (WIN32)
+      set (LIB_RELEASE_NAME "${libname}")
+      set (LIB_DEBUG_NAME "${libname}_debug")
+    endif (WIN32)
+  else (${libtype} MATCHES "SHARED")
+    if (WIN32)
+      set (LIB_RELEASE_NAME "lib${libname}")
+      set (LIB_DEBUG_NAME "lib${libname}_D")
+    else (WIN32)
       # if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value
-      IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET (LIB_RELEASE_NAME "${libname}")
-        SET (LIB_DEBUG_NAME "${libname}_debug")
-      ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET (LIB_RELEASE_NAME "lib${libname}")
-        SET (LIB_DEBUG_NAME "lib${libname}_debug")
-      ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-    ENDIF (WIN32)
-  ENDIF (${libtype} MATCHES "SHARED")
+      if (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        set (LIB_RELEASE_NAME "${libname}")
+        set (LIB_DEBUG_NAME "${libname}_debug")
+      else (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        set (LIB_RELEASE_NAME "lib${libname}")
+        set (LIB_DEBUG_NAME "lib${libname}_debug")
+      endif (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+    endif (WIN32)
+  endif (${libtype} MATCHES "SHARED")
   
-  SET_TARGET_PROPERTIES (${libtarget}
+  set_target_properties (${libtarget}
       PROPERTIES
       DEBUG_OUTPUT_NAME          ${LIB_DEBUG_NAME}
       RELEASE_OUTPUT_NAME        ${LIB_RELEASE_NAME}
@@ -109,79 +109,79 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
   )
   
   #----- Use MSVC Naming conventions for Shared Libraries
-  IF (MINGW AND ${libtype} MATCHES "SHARED")
-    SET_TARGET_PROPERTIES (${libtarget}
+  if (MINGW AND ${libtype} MATCHES "SHARED")
+    set_target_properties (${libtarget}
         PROPERTIES
         IMPORT_SUFFIX ".lib"
         IMPORT_PREFIX ""
         PREFIX ""
     )
-  ENDIF (MINGW AND ${libtype} MATCHES "SHARED")
+  endif (MINGW AND ${libtype} MATCHES "SHARED")
 
 ENDMACRO (HDF_SET_LIB_OPTIONS)
 
 #-------------------------------------------------------------------------------
 MACRO (TARGET_C_PROPERTIES wintarget addcompileflags addlinkflags)
-  IF (MSVC)
+  if (MSVC)
     TARGET_MSVC_PROPERTIES (${wintarget} "${addcompileflags} ${WIN_COMPILE_FLAGS}" "${addlinkflags} ${WIN_LINK_FLAGS}")
-  ELSE (MSVC)
-    IF (BUILD_SHARED_LIBS)
-      SET_TARGET_PROPERTIES (${wintarget}
+  else (MSVC)
+    if (BUILD_SHARED_LIBS)
+      set_target_properties (${wintarget}
           PROPERTIES
               COMPILE_FLAGS "${addcompileflags}"
               LINK_FLAGS "${addlinkflags}"
       ) 
-    ELSE (BUILD_SHARED_LIBS)
-      SET_TARGET_PROPERTIES (${wintarget}
+    else (BUILD_SHARED_LIBS)
+      set_target_properties (${wintarget}
           PROPERTIES
               COMPILE_FLAGS "${addcompileflags}"
               LINK_FLAGS "${addlinkflags}"
       ) 
-    ENDIF (BUILD_SHARED_LIBS)
-  ENDIF (MSVC)
+    endif (BUILD_SHARED_LIBS)
+  endif (MSVC)
 ENDMACRO (TARGET_C_PROPERTIES)
 
 #-------------------------------------------------------------------------------
 MACRO (TARGET_MSVC_PROPERTIES wintarget addcompileflags addlinkflags)
-  IF (MSVC)
-    IF (BUILD_SHARED_LIBS)
-      SET_TARGET_PROPERTIES (${wintarget}
+  if (MSVC)
+    if (BUILD_SHARED_LIBS)
+      set_target_properties (${wintarget}
           PROPERTIES
               COMPILE_FLAGS "${addcompileflags}"
               LINK_FLAGS "${addlinkflags}"
       ) 
-    ELSE (BUILD_SHARED_LIBS)
-      SET_TARGET_PROPERTIES (${wintarget}
+    else (BUILD_SHARED_LIBS)
+      set_target_properties (${wintarget}
           PROPERTIES
               COMPILE_FLAGS "${addcompileflags}"
               LINK_FLAGS "${addlinkflags}"
       ) 
-    ENDIF (BUILD_SHARED_LIBS)
-  ENDIF (MSVC)
+    endif (BUILD_SHARED_LIBS)
+  endif (MSVC)
 ENDMACRO (TARGET_MSVC_PROPERTIES)
 
 #-------------------------------------------------------------------------------
 MACRO (TARGET_FORTRAN_PROPERTIES forttarget addcompileflags addlinkflags)
-  IF (WIN32)
+  if (WIN32)
     TARGET_FORTRAN_WIN_PROPERTIES (${forttarget} "${addcompileflags} ${WIN_COMPILE_FLAGS}" "${addlinkflags} ${WIN_LINK_FLAGS}")
-  ENDIF (WIN32)
+  endif (WIN32)
 ENDMACRO (TARGET_FORTRAN_PROPERTIES)
 
 #-------------------------------------------------------------------------------
 MACRO (TARGET_FORTRAN_WIN_PROPERTIES forttarget addcompileflags addlinkflags)
-  IF (MSVC)
-    IF (BUILD_SHARED_LIBS)
-      SET_TARGET_PROPERTIES (${forttarget}
+  if (MSVC)
+    if (BUILD_SHARED_LIBS)
+      set_target_properties (${forttarget}
           PROPERTIES
               COMPILE_FLAGS "/dll ${addcompileflags}"
               LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
       ) 
-    ELSE (BUILD_SHARED_LIBS)
-      SET_TARGET_PROPERTIES (${forttarget}
+    else (BUILD_SHARED_LIBS)
+      set_target_properties (${forttarget}
           PROPERTIES
               COMPILE_FLAGS "${addcompileflags}"
               LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
       ) 
-    ENDIF (BUILD_SHARED_LIBS)
-  ENDIF (MSVC)
+    endif (BUILD_SHARED_LIBS)
+  endif (MSVC)
 ENDMACRO (TARGET_FORTRAN_WIN_PROPERTIES)
diff --git a/config/cmake/PkgInfo.in b/config/cmake/PkgInfo.in
new file mode 100644
index 0000000..e530f88
--- /dev/null
+++ b/config/cmake/PkgInfo.in
@@ -0,0 +1 @@
+FMWK????
\ No newline at end of file
diff --git a/config/cmake/UserMacros/Windows_MT.cmake b/config/cmake/UserMacros/Windows_MT.cmake
index 175c420..a54f22c 100644
--- a/config/cmake/UserMacros/Windows_MT.cmake
+++ b/config/cmake/UserMacros/Windows_MT.cmake
@@ -11,31 +11,31 @@
 # Option to Build with Static CRT libraries on Windows
 #-------------------------------------------------------------------------------
 MACRO (TARGET_STATIC_CRT_FLAGS)
-  IF (MSVC AND NOT BUILD_SHARED_LIBS)
-    FOREACH (flag_var
+  if (MSVC AND NOT BUILD_SHARED_LIBS)
+    foreach (flag_var
         CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
         CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
         CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
         CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-      IF (${flag_var} MATCHES "/MD")
-        STRING (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-      ENDIF (${flag_var} MATCHES "/MD")
-    ENDFOREACH (flag_var)
-    FOREACH (flag_var
+      if (${flag_var} MATCHES "/MD")
+        string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+      endif (${flag_var} MATCHES "/MD")
+    endforeach (flag_var)
+    foreach (flag_var
         CMAKE_Fortran_FLAGS CMAKE_Fortran_FLAGS_DEBUG CMAKE_Fortran_FLAGS_RELEASE
         CMAKE_Fortran_FLAGS_MINSIZEREL CMAKE_Fortran_FLAGS_RELWITHDEBINFO)
-      IF (${flag_var} MATCHES "/libs:dll")
-        STRING (REGEX REPLACE "/libs:dll" "/libs:static" ${flag_var} "${${flag_var}}")
-      ENDIF (${flag_var} MATCHES "/libs:dll")
-    ENDFOREACH (flag_var)
-    SET (WIN_COMPILE_FLAGS "")
-    SET (WIN_LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
-  ENDIF (MSVC AND NOT BUILD_SHARED_LIBS)
+      if (${flag_var} MATCHES "/libs:dll")
+        string (REGEX REPLACE "/libs:dll" "/libs:static" ${flag_var} "${${flag_var}}")
+      endif (${flag_var} MATCHES "/libs:dll")
+    endforeach (flag_var)
+    set (WIN_COMPILE_FLAGS "")
+    set (WIN_LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
+  endif (MSVC AND NOT BUILD_SHARED_LIBS)
 ENDMACRO (TARGET_STATIC_CRT_FLAGS)
 
 #-----------------------------------------------------------------------------
-OPTION (BUILD_STATIC_CRT_LIBS "Build With Static CRT Libraries" OFF)
-IF (BUILD_STATIC_CRT_LIBS)
+option (BUILD_STATIC_CRT_LIBS "Build With Static CRT Libraries" OFF)
+if (BUILD_STATIC_CRT_LIBS)
   TARGET_STATIC_CRT_FLAGS ()
-ENDIF (BUILD_STATIC_CRT_LIBS)
+endif (BUILD_STATIC_CRT_LIBS)
  
\ No newline at end of file
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 43ba754..f715a3f 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -4,75 +4,75 @@
 # EXTERNAL cache entries

 ########################

 

-SET (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries" FORCE)

+set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries" FORCE)

 

-SET (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)

+set (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)

 

-SET (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE)

+set (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE)

 

-SET (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE)

+set (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE)

 

-SET (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE)

+set (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE)

 

-SET (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)

+set (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)

 

-SET (HDF5_ENABLE_F2003 OFF CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE)

+set (HDF5_ENABLE_F2003 OFF CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE)

 

-SET (HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)

+set (HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)

 

-SET (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools" FORCE)

+set (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools" FORCE)

 

-SET (HDF5_BUILD_GENERATORS OFF CACHE BOOL "Build Test Generators" FORCE)

+set (HDF5_BUILD_GENERATORS OFF CACHE BOOL "Build Test Generators" FORCE)

 

-SET (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)

+set (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)

 

-SET (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)

+set (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)

 

-SET (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)

+set (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)

 

-SET (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)

+set (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)

 

-SET (HDF5_ENABLE_UNSUPPORTED OFF CACHE BOOL "Enable unsupported combinations of configuration options" FORCE)

+set (HDF5_ENABLE_UNSUPPORTED OFF CACHE BOOL "Enable unsupported combinations of configuration options" FORCE)

 

-SET (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)

+set (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)

 

-SET (HDF5_ENABLE_DIRECT_VFD OFF CACHE BOOL "Build the Direct I/O Virtual File Driver" FORCE)

+set (HDF5_ENABLE_DIRECT_VFD OFF CACHE BOOL "Build the Direct I/O Virtual File Driver" FORCE)

 

-SET (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)

+set (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)

 

-SET (MPIEXEC_MAX_NUMPROCS "3" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)

+set (MPIEXEC_MAX_NUMPROCS "3" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)

 

-SET (HDF5_BUILD_PARALLEL_ALL OFF CACHE BOOL "Build Parallel Programs" FORCE)

+set (HDF5_BUILD_PARALLEL_ALL OFF CACHE BOOL "Build Parallel Programs" FORCE)

 

-SET (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)

+set (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)

 

-SET (HDF5_ENABLE_USING_MEMCHECKER OFF CACHE BOOL "Indicate that a memory checker is used" FORCE)

+set (HDF5_ENABLE_USING_MEMCHECKER OFF CACHE BOOL "Indicate that a memory checker is used" FORCE)

 

-SET (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)

+set (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)

 

-SET (HDF5_USE_FOLDERS ON CACHE BOOL "Enable folder grouping of projects in IDEs." FORCE)

+set (HDF5_USE_FOLDERS ON CACHE BOOL "Enable folder grouping of projects in IDEs." FORCE)

 

-SET (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)

+set (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)

 

-SET (HDF5_USE_18_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.8.x API by default" FORCE)

+set (HDF5_USE_18_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.8.x API by default" FORCE)

 

-SET (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)

+set (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)

 

-SET (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)

+set (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)

 

-SET (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE)

+set (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE)

 

-SET (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)" FORCE)

+set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)" FORCE)

 SET_PROPERTY(CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ)

 

-SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)

+set (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)

 

-SET (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)

+set (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)

 

-SET (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)

+set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)

 

-SET (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)

+set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)

 

-SET (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)

+set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)

 

-SET (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)

+set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)

diff --git a/config/cmake/grepTest.cmake b/config/cmake/grepTest.cmake
index 74ac912..579d855 100644
--- a/config/cmake/grepTest.cmake
+++ b/config/cmake/grepTest.cmake
@@ -2,29 +2,29 @@
 # against a reference file. Exit status of command can also be compared.
 
 # arguments checking
-IF (NOT TEST_PROGRAM)
-  MESSAGE (FATAL_ERROR "Require TEST_PROGRAM to be defined")
-ENDIF (NOT TEST_PROGRAM)
-#IF (NOT TEST_ARGS)
-#  MESSAGE (STATUS "Require TEST_ARGS to be defined")
-#ENDIF (NOT TEST_ARGS)
-IF (NOT TEST_FOLDER)
-  MESSAGE ( FATAL_ERROR "Require TEST_FOLDER to be defined")
-ENDIF (NOT TEST_FOLDER)
-IF (NOT TEST_OUTPUT)
-  MESSAGE (FATAL_ERROR "Require TEST_OUTPUT to be defined")
-ENDIF (NOT TEST_OUTPUT)
-#IF (NOT TEST_EXPECT)
-#  MESSAGE (STATUS "Require TEST_EXPECT to be defined")
-#ENDIF (NOT TEST_EXPECT)
-IF (NOT TEST_FILTER)
-  MESSAGE (STATUS "Require TEST_FILTER to be defined")
-ENDIF (NOT TEST_FILTER)
-IF (NOT TEST_REFERENCE)
-  MESSAGE (FATAL_ERROR "Require TEST_REFERENCE to be defined")
-ENDIF (NOT TEST_REFERENCE)
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif (NOT TEST_PROGRAM)
+#if (NOT TEST_ARGS)
+#  message (STATUS "Require TEST_ARGS to be defined")
+#endif (NOT TEST_ARGS)
+if (NOT TEST_FOLDER)
+  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif (NOT TEST_FOLDER)
+if (NOT TEST_OUTPUT)
+  message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
+endif (NOT TEST_OUTPUT)
+#if (NOT TEST_EXPECT)
+#  message (STATUS "Require TEST_EXPECT to be defined")
+#endif (NOT TEST_EXPECT)
+if (NOT TEST_FILTER)
+  message (STATUS "Require TEST_FILTER to be defined")
+endif (NOT TEST_FILTER)
+if (NOT TEST_REFERENCE)
+  message (FATAL_ERROR "Require TEST_REFERENCE to be defined")
+endif (NOT TEST_REFERENCE)
 
-MESSAGE (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
 
 # run the test program, capture the stdout/stderr and the result var
 EXECUTE_PROCESS (
@@ -37,28 +37,28 @@ EXECUTE_PROCESS (
     ERROR_VARIABLE TEST_ERROR
 )
 
-MESSAGE (STATUS "COMMAND Result: ${TEST_RESULT}")
-MESSAGE (STATUS "COMMAND Error: ${TEST_ERROR}")
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
 # now grep the output with the reference
-FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
 
 # TEST_REFERENCE should always be matched
 STRING(REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM}) 
 STRING(COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_RESULT) 
-IF (${TEST_RESULT} STREQUAL "0")
-  MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
-ENDIF (${TEST_RESULT} STREQUAL "0")
+if (${TEST_RESULT} STREQUAL "0")
+  message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+endif (${TEST_RESULT} STREQUAL "0")
 
 STRING(REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM}) 
-IF (${TEST_EXPECT} STREQUAL "1")
+if (${TEST_EXPECT} STREQUAL "1")
   # TEST_EXPECT (1) interperts TEST_FILTER as NOT to match
   STRING(LENGTH "${TEST_MATCH}" TEST_RESULT) 
-  IF (NOT ${TEST_RESULT} STREQUAL "0")
-    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
-  ENDIF (NOT ${TEST_RESULT} STREQUAL "0")
-ENDIF (${TEST_EXPECT} STREQUAL "1")
+  if (NOT ${TEST_RESULT} STREQUAL "0")
+    message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+  endif (NOT ${TEST_RESULT} STREQUAL "0")
+endif (${TEST_EXPECT} STREQUAL "1")
 
 # everything went fine...
-MESSAGE ("Passed: The output of ${TEST_PROGRAM} matched")
+message ("Passed: The output of ${TEST_PROGRAM} matched")
 
diff --git a/config/cmake/hdf.bmp b/config/cmake/hdf.bmp
new file mode 100644
index 0000000..9e9e4aa
--- /dev/null
+++ b/config/cmake/hdf.bmp
diff --git a/config/cmake/hdf.gif b/config/cmake/hdf.gif
deleted file mode 100644
index 656617b..0000000
--- a/config/cmake/hdf.gif
+++ /dev/null
diff --git a/config/cmake/hdf.icns b/config/cmake/hdf.icns
new file mode 100755
index 0000000..22afa2e
--- /dev/null
+++ b/config/cmake/hdf.icns
diff --git a/config/cmake/hdf.ico b/config/cmake/hdf.ico
new file mode 100644
index 0000000..26abc96
--- /dev/null
+++ b/config/cmake/hdf.ico
diff --git a/config/cmake/hdf5-config-version.cmake.in b/config/cmake/hdf5-config-version.cmake.in
index c1201cc..c3d0811 100644
--- a/config/cmake/hdf5-config-version.cmake.in
+++ b/config/cmake/hdf5-config-version.cmake.in
@@ -2,26 +2,26 @@
 # HDF5 Version file for install directory

 #-----------------------------------------------------------------------------

 

-SET (PACKAGE_VERSION @HDF5_VERSION_STRING@)

+set (PACKAGE_VERSION @HDF5_VERSION_STRING@)

 

-IF ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @H5_VERS_MAJOR@)

+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @H5_VERS_MAJOR@)

 

   # exact match for version @H5_VERS_MAJOR@.@H5_VERS_MINOR@

-  IF ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @H5_VERS_MINOR@)

+  if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @H5_VERS_MINOR@)

 

     # compatible with any version @H5_VERS_MAJOR@.@H5_VERS_MINOR@.x

-    SET (PACKAGE_VERSION_COMPATIBLE 1) 

+    set (PACKAGE_VERSION_COMPATIBLE 1) 

     

-    IF ("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @H5_VERS_RELEASE@)

-      SET (PACKAGE_VERSION_EXACT 1)    

+    if ("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @H5_VERS_RELEASE@)

+      set (PACKAGE_VERSION_EXACT 1)    

 

-      IF ("${PACKAGE_FIND_VERSION_TWEAK}" EQUAL @H5_VERS_SUBRELEASE@)

+      if ("${PACKAGE_FIND_VERSION_TWEAK}" EQUAL @H5_VERS_SUBRELEASE@)

         # not using this yet

-      ENDIF ("${PACKAGE_FIND_VERSION_TWEAK}" EQUAL @H5_VERS_SUBRELEASE@)

+      endif ("${PACKAGE_FIND_VERSION_TWEAK}" EQUAL @H5_VERS_SUBRELEASE@)

       

-    ENDIF ("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @H5_VERS_RELEASE@)

+    endif ("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @H5_VERS_RELEASE@)

     

-  ENDIF ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @H5_VERS_MINOR@)

-ENDIF ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @H5_VERS_MAJOR@)

+  endif ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @H5_VERS_MINOR@)

+endif ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @H5_VERS_MAJOR@)

 

 

diff --git a/config/cmake/hdf5-config.cmake.build.in b/config/cmake/hdf5-config.cmake.build.in
index fbe97ac..60888c8 100644
--- a/config/cmake/hdf5-config.cmake.build.in
+++ b/config/cmake/hdf5-config.cmake.build.in
@@ -6,16 +6,16 @@ GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 #-----------------------------------------------------------------------------

 # User Options

 #-----------------------------------------------------------------------------

-SET (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)

-SET (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)

-SET (HDF5_ENABLE_F2003    @HDF5_ENABLE_F2003@)

-SET (HDF5_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)

-SET (HDF5_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)

-SET (HDF5_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)

-SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)

-SET (HDF5_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)

-SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)

-SET (HDF5_BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)

+set (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)

+set (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)

+set (HDF5_ENABLE_F2003    @HDF5_ENABLE_F2003@)

+set (HDF5_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)

+set (HDF5_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)

+set (HDF5_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)

+set (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)

+set (HDF5_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)

+set (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)

+set (HDF5_BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)

 

 #-----------------------------------------------------------------------------

 # Dependencies

@@ -28,46 +28,46 @@ ENDIF(HDF5_ENABLE_PARALLEL)
 #-----------------------------------------------------------------------------

 # Directories

 #-----------------------------------------------------------------------------

-SET (HDF5_INCLUDE_DIR "@HDF5_INCLUDES_BUILD_TIME@" "${HDF5_MPI_C_INCLUDE_PATH}" )

+set (HDF5_INCLUDE_DIR "@HDF5_INCLUDES_BUILD_TIME@" "${HDF5_MPI_C_INCLUDE_PATH}" )

 

-IF (HDF5_BUILD_FORTRAN)

-  SET (HDF5_INCLUDE_DIR_FORTRAN "@CMAKE_Fortran_MODULE_DIRECTORY@" )

-ENDIF (HDF5_BUILD_FORTRAN)

+if (HDF5_BUILD_FORTRAN)

+  set (HDF5_INCLUDE_DIR_FORTRAN "@CMAKE_Fortran_MODULE_DIRECTORY@" )

+endif (HDF5_BUILD_FORTRAN)

   

-IF (HDF5_BUILD_CPP_LIB)

-  SET (HDF5_INCLUDE_DIR_CPP ${HDF5_INCLUDE_DIR} )

-ENDIF (HDF5_BUILD_CPP_LIB)

+if (HDF5_BUILD_CPP_LIB)

+  set (HDF5_INCLUDE_DIR_CPP ${HDF5_INCLUDE_DIR} )

+endif (HDF5_BUILD_CPP_LIB)

 

-IF (HDF5_BUILD_HL_LIB)

-  SET (HDF5_INCLUDE_DIR_HL ${HDF5_INCLUDE_DIR} )

-ENDIF (HDF5_BUILD_HL_LIB)

+if (HDF5_BUILD_HL_LIB)

+  set (HDF5_INCLUDE_DIR_HL ${HDF5_INCLUDE_DIR} )

+endif (HDF5_BUILD_HL_LIB)

 

-IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

-  SET (HDF5_INCLUDE_DIR_HL_CPP ${HDF5_INCLUDE_DIR} )

-ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

+if (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

+  set (HDF5_INCLUDE_DIR_HL_CPP ${HDF5_INCLUDE_DIR} )

+endif (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

 

-IF (HDF5_BUILD_TOOLS)

-  SET (HDF5_INCLUDE_DIR_TOOLS ${HDF5_INCLUDE_DIR} )

-ENDIF (HDF5_BUILD_TOOLS)

+if (HDF5_BUILD_TOOLS)

+  set (HDF5_INCLUDE_DIR_TOOLS ${HDF5_INCLUDE_DIR} )

+endif (HDF5_BUILD_TOOLS)

 

-IF (HDF5_BUILD_SHARED_LIBS)

-  SET (H5_BUILT_AS_DYNAMIC_LIB 1 )

-ELSE (HDF5_BUILD_SHARED_LIBS)

-  SET (H5_BUILT_AS_STATIC_LIB 1 )

-ENDIF (HDF5_BUILD_SHARED_LIBS)

+if (HDF5_BUILD_SHARED_LIBS)

+  set (H5_BUILT_AS_DYNAMIC_LIB 1 )

+else (HDF5_BUILD_SHARED_LIBS)

+  set (H5_BUILT_AS_STATIC_LIB 1 )

+endif (HDF5_BUILD_SHARED_LIBS)

 

 #-----------------------------------------------------------------------------

 # Version Strings

 #-----------------------------------------------------------------------------

-SET (HDF5_VERSION_STRING @HDF5_VERSION_STRING@)

-SET (HDF5_VERSION_MAJOR  @HDF5_VERSION_MAJOR@)

-SET (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)

+set (HDF5_VERSION_STRING @HDF5_VERSION_STRING@)

+set (HDF5_VERSION_MAJOR  @HDF5_VERSION_MAJOR@)

+set (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)

 

 #-----------------------------------------------------------------------------

 # Don't include targets if this file is being picked up by another

 # project which has already build hdf5 as a subproject

 #-----------------------------------------------------------------------------

-IF (NOT TARGET "@HDF5_PACKAGE@")

-  INCLUDE (${SELF_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)

-  SET (HDF5_LIBRARIES "@HDF5_LIBRARIES_TO_EXPORT@")

-ENDIF (NOT TARGET "@HDF5_PACKAGE@")

+if (NOT TARGET "@HDF5_PACKAGE@")

+  include (${SELF_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)

+  set (HDF5_LIBRARIES "@HDF5_LIBRARIES_TO_EXPORT@")

+endif (NOT TARGET "@HDF5_PACKAGE@")

diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in
index 9c5a5a1..799ff9d 100644
--- a/config/cmake/hdf5-config.cmake.install.in
+++ b/config/cmake/hdf5-config.cmake.install.in
@@ -4,24 +4,24 @@
 GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)

 GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${SELF_DIR}" PATH)

 GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)

-IF (NOT WIN32)

+if (NOT WIN32)

   GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)

-ENDIF (NOT WIN32)

+endif (NOT WIN32)

 

 #-----------------------------------------------------------------------------

 # User Options

 #-----------------------------------------------------------------------------

-SET (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)

-SET (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)

-SET (HDF5_ENABLE_F2003    @HDF5_ENABLE_F2003@)

-SET (HDF5_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)

-SET (HDF5_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)

-SET (HDF5_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)

-SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)

-SET (HDF5_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)

-SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)

-SET (HDF5_BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)

-SET (HDF5_PACKAGE_EXTLIBS      @HDF5_PACKAGE_EXTLIBS@)

+set (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)

+set (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)

+set (HDF5_ENABLE_F2003    @HDF5_ENABLE_F2003@)

+set (HDF5_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)

+set (HDF5_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)

+set (HDF5_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)

+set (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)

+set (HDF5_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)

+set (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)

+set (HDF5_BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)

+set (HDF5_PACKAGE_EXTLIBS      @HDF5_PACKAGE_EXTLIBS@)

 

 #-----------------------------------------------------------------------------

 # Dependencies

@@ -34,48 +34,48 @@ ENDIF(HDF5_ENABLE_PARALLEL)
 #-----------------------------------------------------------------------------

 # Directories

 #-----------------------------------------------------------------------------

-SET (HDF5_INCLUDE_DIR "${_IMPORT_PREFIX}/include" "${HDF5_MPI_C_INCLUDE_PATH}" )

+set (HDF5_INCLUDE_DIR "${_IMPORT_PREFIX}/include" "${HDF5_MPI_C_INCLUDE_PATH}" )

 

-IF (HDF5_BUILD_FORTRAN)

-  SET (HDF5_INCLUDE_DIR_FORTRAN "${_IMPORT_PREFIX}/include/fortran" )

-ENDIF (HDF5_BUILD_FORTRAN)

+if (HDF5_BUILD_FORTRAN)

+  set (HDF5_INCLUDE_DIR_FORTRAN "${_IMPORT_PREFIX}/include/fortran" )

+endif (HDF5_BUILD_FORTRAN)

   

-IF (HDF5_BUILD_CPP_LIB)

-  SET (HDF5_INCLUDE_DIR_CPP "${_IMPORT_PREFIX}/include/cpp" )

-ENDIF (HDF5_BUILD_CPP_LIB)

+if (HDF5_BUILD_CPP_LIB)

+  set (HDF5_INCLUDE_DIR_CPP "${_IMPORT_PREFIX}/include/cpp" )

+endif (HDF5_BUILD_CPP_LIB)

 

-IF (HDF5_BUILD_HL_LIB)

-  SET (HDF5_INCLUDE_DIR_HL "${_IMPORT_PREFIX}/include/hl" )

-ENDIF (HDF5_BUILD_HL_LIB)

+if (HDF5_BUILD_HL_LIB)

+  set (HDF5_INCLUDE_DIR_HL "${_IMPORT_PREFIX}/include/hl" )

+endif (HDF5_BUILD_HL_LIB)

 

-IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

-  SET (HDF5_INCLUDE_DIR_HL_CPP "${_IMPORT_PREFIX}/include/hl/cpp" )

-ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

+if (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

+  set (HDF5_INCLUDE_DIR_HL_CPP "${_IMPORT_PREFIX}/include/hl/cpp" )

+endif (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

 

-IF (HDF5_BUILD_TOOLS)

-  SET (HDF5_INCLUDE_DIR_TOOLS "${_IMPORT_PREFIX}/include" )

-  SET (HDF5_TOOLS_DIR "${_IMPORT_PREFIX}/bin" )

-ENDIF (HDF5_BUILD_TOOLS)

+if (HDF5_BUILD_TOOLS)

+  set (HDF5_INCLUDE_DIR_TOOLS "${_IMPORT_PREFIX}/include" )

+  set (HDF5_TOOLS_DIR "${_IMPORT_PREFIX}/bin" )

+endif (HDF5_BUILD_TOOLS)

 

 #-----------------------------------------------------------------------------

 # Version Strings

 #-----------------------------------------------------------------------------

-SET (HDF5_VERSION_STRING @HDF5_VERSION_STRING@)

-SET (HDF5_VERSION_MAJOR  @HDF5_VERSION_MAJOR@)

-SET (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)

+set (HDF5_VERSION_STRING @HDF5_VERSION_STRING@)

+set (HDF5_VERSION_MAJOR  @HDF5_VERSION_MAJOR@)

+set (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)

 

 #-----------------------------------------------------------------------------

 # Don't include targets if this file is being picked up by another

 # project which has already built hdf5 as a subproject

 #-----------------------------------------------------------------------------

-IF (NOT TARGET "@HDF5_PACKAGE@")

-  IF (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib")

-    INCLUDE (${SELF_DIR}/../ZLIB/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)

-  ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib")

-  IF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip")

-    INCLUDE (${SELF_DIR}/../SZIP/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)

-  ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip")

-  INCLUDE (${SELF_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)

-  SET (HDF5_LIBRARIES "@HDF5_LIBRARIES_TO_EXPORT@")

-ENDIF (NOT TARGET "@HDF5_PACKAGE@")

+if (NOT TARGET "@HDF5_PACKAGE@")

+  if (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib")

+    include (${SELF_DIR}/../ZLIB/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)

+  endif (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib")

+  if (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip")

+    include (${SELF_DIR}/../SZIP/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)

+  endif (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip")

+  include (${SELF_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)

+  set (HDF5_LIBRARIES "@HDF5_LIBRARIES_TO_EXPORT@")

+endif (NOT TARGET "@HDF5_PACKAGE@")

 

diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 3970a9f..418a6cf 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -63,7 +63,6 @@ Features:
 Clear file buffers before write: @HDF5_Enable_Clear_File_Buffers@
            Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
          Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
-                           GPFS: @HDF5_ENABLE_GPFS@
       Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
    Optimization Instrumentation: @HDF5_Enable_Instrument@
        Large File Support (LFS): @HDF5_ENABLE_LARGE_FILE@
diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake
index 8ca3879..dd1a311 100644
--- a/config/cmake/mccacheinit.cmake
+++ b/config/cmake/mccacheinit.cmake
@@ -4,78 +4,78 @@
 # EXTERNAL cache entries

 ########################

 

-SET (BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE)

+set (BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE)

 

-SET (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)

+set (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)

 

-SET (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE)

+set (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE)

 

-SET (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE)

+set (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE)

 

-SET (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE)

+set (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE)

 

-SET (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)

+set (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)

 

-SET (HDF5_ENABLE_F2003 OFF CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE)

+set (HDF5_ENABLE_F2003 OFF CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE)

 

-SET (HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)

+set (HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)

 

-SET (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools" FORCE)

+set (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools" FORCE)

 

-SET (HDF5_BUILD_GENERATORS OFF CACHE BOOL "Build Test Generators" FORCE)

+set (HDF5_BUILD_GENERATORS OFF CACHE BOOL "Build Test Generators" FORCE)

 

-SET (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)

+set (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)

 

-SET (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)

+set (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)

 

-SET (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)

+set (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)

 

-SET (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)

+set (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)

 

-SET (HDF5_ENABLE_UNSUPPORTED OFF CACHE BOOL "Enable unsupported combinations of configuration options" FORCE)

+set (HDF5_ENABLE_UNSUPPORTED OFF CACHE BOOL "Enable unsupported combinations of configuration options" FORCE)

 

-SET (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)

+set (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)

 

-SET (HDF5_ENABLE_DIRECT_VFD OFF CACHE BOOL "Build the Direct I/O Virtual File Driver" FORCE)

+set (HDF5_ENABLE_DIRECT_VFD OFF CACHE BOOL "Build the Direct I/O Virtual File Driver" FORCE)

 

-SET (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)

+set (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)

 

-SET (MPIEXEC_MAX_NUMPROCS "3" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)

+set (MPIEXEC_MAX_NUMPROCS "3" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)

 

-SET (HDF5_BUILD_PARALLEL_ALL OFF CACHE BOOL "Build Parallel Programs" FORCE)

+set (HDF5_BUILD_PARALLEL_ALL OFF CACHE BOOL "Build Parallel Programs" FORCE)

 

-SET (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)

+set (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)

 

-SET (HDF5_ENABLE_USING_MEMCHECKER ON CACHE BOOL "Indicate that a memory checker is used" FORCE)

+set (HDF5_ENABLE_USING_MEMCHECKER ON CACHE BOOL "Indicate that a memory checker is used" FORCE)

 

-SET (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)

+set (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)

 

-SET (HDF5_USE_FOLDERS ON CACHE BOOL "Enable folder grouping of projects in IDEs." FORCE)

+set (HDF5_USE_FOLDERS ON CACHE BOOL "Enable folder grouping of projects in IDEs." FORCE)

 

-SET (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)

+set (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)

 

-SET (HDF5_USE_18_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.8.x API by default" FORCE)

+set (HDF5_USE_18_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.8.x API by default" FORCE)

 

-SET (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)

+set (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)

 

-SET (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)

+set (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)

 

-SET (HDF5_NO_PACKAGES ON CACHE BOOL "CPACK - Disable packaging" FORCE)

+set (HDF5_NO_PACKAGES ON CACHE BOOL "CPACK - Disable packaging" FORCE)

 

-SET (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building" FORCE)

+set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building" FORCE)

 

-SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)

+set (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)

 

-SET (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)

+set (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)

 

-SET (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)

+set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)

 

-SET (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)

+set (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)

 

-SET (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE)

+set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE)

 

-SET (CTEST_BUILD_CONFIGURATION "Debug" CACHE STRING "Build Debug" FORCE)

+set (CTEST_BUILD_CONFIGURATION "Debug" CACHE STRING "Build Debug" FORCE)

 

-SET (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)

+set (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)

 

-SET (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)

+set (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)

diff --git a/config/cmake/prunTest.cmake b/config/cmake/prunTest.cmake
index b9ead6f..3d5ec31 100644
--- a/config/cmake/prunTest.cmake
+++ b/config/cmake/prunTest.cmake
@@ -3,35 +3,35 @@
 cmake_policy(SET CMP0007 NEW)
 
 # arguments checking
-IF (NOT TEST_PROGRAM)
-  MESSAGE (FATAL_ERROR "Require TEST_PROGRAM to be defined")
-ENDIF (NOT TEST_PROGRAM)
-#IF (NOT TEST_ARGS)
-#  MESSAGE (STATUS "Require TEST_ARGS to be defined")
-#ENDIF (NOT TEST_ARGS)
-IF (NOT TEST_FOLDER)
-  MESSAGE ( FATAL_ERROR "Require TEST_FOLDER to be defined")
-ENDIF (NOT TEST_FOLDER)
-IF (NOT TEST_OUTPUT)
-  MESSAGE (FATAL_ERROR "Require TEST_OUTPUT to be defined")
-ENDIF (NOT TEST_OUTPUT)
-#IF (NOT TEST_EXPECT)
-#  MESSAGE (STATUS "Require TEST_EXPECT to be defined")
-#ENDIF (NOT TEST_EXPECT)
-#IF (NOT TEST_FILTER)
-#  MESSAGE (STATUS "Require TEST_FILTER to be defined")
-#ENDIF (NOT TEST_FILTER)
-IF (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
-  MESSAGE (FATAL_ERROR "Require TEST_REFERENCE to be defined")
-ENDIF (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
-
-SET (ERROR_APPEND 1)
-
-MESSAGE (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
-
-IF (TEST_ENV_VAR)
-  SET (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}") 
-ENDIF (TEST_ENV_VAR)
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif (NOT TEST_PROGRAM)
+#if (NOT TEST_ARGS)
+#  message (STATUS "Require TEST_ARGS to be defined")
+#endif (NOT TEST_ARGS)
+if (NOT TEST_FOLDER)
+  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif (NOT TEST_FOLDER)
+if (NOT TEST_OUTPUT)
+  message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
+endif (NOT TEST_OUTPUT)
+#if (NOT TEST_EXPECT)
+#  message (STATUS "Require TEST_EXPECT to be defined")
+#endif (NOT TEST_EXPECT)
+#if (NOT TEST_FILTER)
+#  message (STATUS "Require TEST_FILTER to be defined")
+#endif (NOT TEST_FILTER)
+if (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
+  message (FATAL_ERROR "Require TEST_REFERENCE to be defined")
+endif (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
+
+set (ERROR_APPEND 1)
+
+message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+
+if (TEST_ENV_VAR)
+  set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}") 
+endif (TEST_ENV_VAR)
 
 # run the test program, capture the stdout/stderr and the result var
 EXECUTE_PROCESS (
@@ -44,36 +44,36 @@ EXECUTE_PROCESS (
     ERROR_VARIABLE TEST_ERROR
 )
 
-MESSAGE (STATUS "COMMAND Result: ${TEST_RESULT}")
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
 
-FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-FILE (WRITE ${TEST_FOLDER}/P_${TEST_REFERENCE} "${TEST_STREAM}")
+file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+file (WRITE ${TEST_FOLDER}/P_${TEST_REFERENCE} "${TEST_STREAM}")
 
-IF (ERROR_APPEND)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") 
-ENDIF (ERROR_APPEND)
+if (ERROR_APPEND)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") 
+endif (ERROR_APPEND)
 
-IF (TEST_APPEND)
-  FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_APPEND} ${TEST_ERROR}\n") 
-ENDIF (TEST_APPEND)
+if (TEST_APPEND)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_APPEND} ${TEST_ERROR}\n") 
+endif (TEST_APPEND)
 
-MESSAGE (STATUS "COMMAND Error: ${TEST_ERROR}")
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
-IF (TEST_MASK)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+if (TEST_MASK)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "Storage:[^\n]+\n" "Storage:   <details removed for portability>\n" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-ENDIF (TEST_MASK)
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif (TEST_MASK)
 
-IF (TEST_MASK_MOD)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+if (TEST_MASK_MOD)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "Modified:[^\n]+\n" "Modified:  XXXX-XX-XX XX:XX:XX XXX\n" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-ENDIF (TEST_MASK_MOD)
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif (TEST_MASK_MOD)
 
-IF (TEST_MASK_ERROR)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+if (TEST_MASK_ERROR)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE " line [0-9]*" " line (number)" TEST_STREAM "${TEST_STREAM}") 
@@ -81,65 +81,65 @@ IF (TEST_MASK_ERROR)
   STRING(REGEX REPLACE "[1-9]*[.][0-9]*[.][0-9]*[^)]*" "version (number)" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-ENDIF (TEST_MASK_ERROR)
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif (TEST_MASK_ERROR)
 
-IF (TEST_FILTER)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+if (TEST_FILTER)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "${TEST_FILTER}" "" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-ENDIF (TEST_FILTER)
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif (TEST_FILTER)
 
-#IF (TEST_REF_FILTER)
-#  MESSAGE (STATUS "TEST_REF_FILTER: ${TEST_APPEND}${TEST_REF_FILTER}")
-#  FILE (READ ${TEST_FOLDER}/P_${TEST_REFERENCE} TEST_STREAM)
+#if (TEST_REF_FILTER)
+#  message (STATUS "TEST_REF_FILTER: ${TEST_APPEND}${TEST_REF_FILTER}")
+#  file (READ ${TEST_FOLDER}/P_${TEST_REFERENCE} TEST_STREAM)
 #  STRING(REGEX REPLACE "${TEST_APPEND}" "${TEST_REF_FILTER}" TEST_STREAM "${TEST_STREAM}") 
-#  FILE (WRITE ${TEST_FOLDER}/P_${TEST_REFERENCE} "${TEST_STREAM}")
-#ENDIF (TEST_REF_FILTER)
+#  file (WRITE ${TEST_FOLDER}/P_${TEST_REFERENCE} "${TEST_STREAM}")
+#endif (TEST_REF_FILTER)
 
-IF (NOT TEST_SKIP_COMPARE)
-  IF (WIN32 AND NOT MINGW)
-    FILE (READ ${TEST_FOLDER}/P_${TEST_REFERENCE} TEST_STREAM)
-    FILE (WRITE ${TEST_FOLDER}/P_${TEST_REFERENCE} "${TEST_STREAM}")
-  ENDIF (WIN32 AND NOT MINGW)
+if (NOT TEST_SKIP_COMPARE)
+  if (WIN32 AND NOT MINGW)
+    file (READ ${TEST_FOLDER}/P_${TEST_REFERENCE} TEST_STREAM)
+    file (WRITE ${TEST_FOLDER}/P_${TEST_REFERENCE} "${TEST_STREAM}")
+  endif (WIN32 AND NOT MINGW)
 
   # now compare the output with the reference
   EXECUTE_PROCESS (
       COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/P_${TEST_REFERENCE}
       RESULT_VARIABLE TEST_RESULT
   )
-  IF (NOT ${TEST_RESULT} STREQUAL 0)
-  SET (TEST_RESULT 0)
-  FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+  if (NOT ${TEST_RESULT} STREQUAL 0)
+  set (TEST_RESULT 0)
+  file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
   LIST (LENGTH test_act len_act)
-  FILE (STRINGS ${TEST_FOLDER}/P_${TEST_REFERENCE} test_ref)
+  file (STRINGS ${TEST_FOLDER}/P_${TEST_REFERENCE} test_ref)
   LIST (LENGTH test_ref len_ref)
-  IF (NOT ${len_act} STREQUAL "0")
+  if (NOT ${len_act} STREQUAL "0")
     MATH (EXPR _FP_LEN "${len_ref} - 1")
-    FOREACH (line RANGE 0 ${_FP_LEN})
+    foreach (line RANGE 0 ${_FP_LEN})
       LIST (GET test_act ${line} str_act)
       LIST (GET test_ref ${line} str_ref)
-      IF (NOT "${str_act}" STREQUAL "${str_ref}")
-        IF (NOT "${str_act}" STREQUAL "")
-          SET (TEST_RESULT 1)
-          MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-         ENDIF (NOT "${str_act}" STREQUAL "")
-      ENDIF (NOT "${str_act}" STREQUAL "${str_ref}")
-    ENDFOREACH (line RANGE 0 ${_FP_LEN})
-  ENDIF (NOT ${len_act} STREQUAL "0")
-  IF (NOT ${len_act} STREQUAL ${len_ref})
-    SET (TEST_RESULT 1)
-  ENDIF (NOT ${len_act} STREQUAL ${len_ref})
-  ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
-
-  MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
+      if (NOT "${str_act}" STREQUAL "${str_ref}")
+        if (NOT "${str_act}" STREQUAL "")
+          set (TEST_RESULT 1)
+          message ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+         endif (NOT "${str_act}" STREQUAL "")
+      endif (NOT "${str_act}" STREQUAL "${str_ref}")
+    endforeach (line RANGE 0 ${_FP_LEN})
+  endif (NOT ${len_act} STREQUAL "0")
+  if (NOT ${len_act} STREQUAL ${len_ref})
+    set (TEST_RESULT 1)
+  endif (NOT ${len_act} STREQUAL ${len_ref})
+  endif (NOT ${TEST_RESULT} STREQUAL 0)
+
+  message (STATUS "COMPARE Result: ${TEST_RESULT}")
 
   # again, if return value is !=0 scream and shout
-  IF (NOT ${TEST_RESULT} STREQUAL 0)
-    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match P_${TEST_REFERENCE}")
-  ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
-ENDIF (NOT TEST_SKIP_COMPARE)
+  if (NOT ${TEST_RESULT} STREQUAL 0)
+    message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match P_${TEST_REFERENCE}")
+  endif (NOT ${TEST_RESULT} STREQUAL 0)
+endif (NOT TEST_SKIP_COMPARE)
 
 # everything went fine...
-MESSAGE ("Passed: The output of ${TEST_PROGRAM} matches P_${TEST_REFERENCE}")
+message ("Passed: The output of ${TEST_PROGRAM} matches P_${TEST_REFERENCE}")
 
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index 0a80873..879426c 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -3,37 +3,37 @@
 cmake_policy(SET CMP0007 NEW)
 
 # arguments checking
-IF (NOT TEST_PROGRAM)
-  MESSAGE (FATAL_ERROR "Require TEST_PROGRAM to be defined")
-ENDIF (NOT TEST_PROGRAM)
-#IF (NOT TEST_ARGS)
-#  MESSAGE (STATUS "Require TEST_ARGS to be defined")
-#ENDIF (NOT TEST_ARGS)
-IF (NOT TEST_FOLDER)
-  MESSAGE ( FATAL_ERROR "Require TEST_FOLDER to be defined")
-ENDIF (NOT TEST_FOLDER)
-IF (NOT TEST_OUTPUT)
-  MESSAGE (FATAL_ERROR "Require TEST_OUTPUT to be defined")
-ENDIF (NOT TEST_OUTPUT)
-IF (NOT TEST_EXPECT)
-  MESSAGE (STATUS "Require TEST_EXPECT to be defined")
-ENDIF (NOT TEST_EXPECT)
-#IF (NOT TEST_FILTER)
-#  MESSAGE (STATUS "Require TEST_FILTER to be defined")
-#ENDIF (NOT TEST_FILTER)
-IF (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
-  MESSAGE (FATAL_ERROR "Require TEST_REFERENCE to be defined")
-ENDIF (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
-
-IF (NOT TEST_ERRREF)
-  SET (ERROR_APPEND 1)
-ENDIF (NOT TEST_ERRREF)
-
-MESSAGE (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
-
-IF (TEST_ENV_VAR)
-  SET (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}") 
-ENDIF (TEST_ENV_VAR)
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif (NOT TEST_PROGRAM)
+#if (NOT TEST_ARGS)
+#  message (STATUS "Require TEST_ARGS to be defined")
+#endif (NOT TEST_ARGS)
+if (NOT TEST_FOLDER)
+  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif (NOT TEST_FOLDER)
+if (NOT TEST_OUTPUT)
+  message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
+endif (NOT TEST_OUTPUT)
+if (NOT TEST_EXPECT)
+  message (STATUS "Require TEST_EXPECT to be defined")
+endif (NOT TEST_EXPECT)
+#if (NOT TEST_FILTER)
+#  message (STATUS "Require TEST_FILTER to be defined")
+#endif (NOT TEST_FILTER)
+if (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
+  message (FATAL_ERROR "Require TEST_REFERENCE to be defined")
+endif (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
+
+if (NOT TEST_ERRREF)
+  set (ERROR_APPEND 1)
+endif (NOT TEST_ERRREF)
+
+message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+
+if (TEST_ENV_VAR)
+  set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}") 
+endif (TEST_ENV_VAR)
 
 # run the test program, capture the stdout/stderr and the result var
 EXECUTE_PROCESS (
@@ -46,42 +46,42 @@ EXECUTE_PROCESS (
     ERROR_VARIABLE TEST_ERROR
 )
 
-MESSAGE (STATUS "COMMAND Result: ${TEST_RESULT}")
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
 
-IF (ERROR_APPEND)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") 
-ENDIF (ERROR_APPEND)
+if (ERROR_APPEND)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") 
+endif (ERROR_APPEND)
 
-IF (TEST_APPEND)
-  FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_APPEND} ${TEST_RESULT}\n") 
-ENDIF (TEST_APPEND)
+if (TEST_APPEND)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_APPEND} ${TEST_RESULT}\n") 
+endif (TEST_APPEND)
 
 # if the return value is !=${TEST_EXPECT} bail out
-IF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
-  MESSAGE ( FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
-ENDIF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
+if (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
+  message ( FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
+endif (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
 
-MESSAGE (STATUS "COMMAND Error: ${TEST_ERROR}")
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
-IF (TEST_MASK)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+if (TEST_MASK)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "Storage:[^\n]+\n" "Storage:   <details removed for portability>\n" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-ENDIF (TEST_MASK)
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif (TEST_MASK)
 
-IF (TEST_MASK_MOD)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+if (TEST_MASK_MOD)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "Modified:[^\n]+\n" "Modified:  XXXX-XX-XX XX:XX:XX XXX\n" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-ENDIF (TEST_MASK_MOD)
-
-IF (TEST_MASK_ERROR)
-  IF (NOT TEST_ERRREF)
-    FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
-  ELSE (NOT TEST_ERRREF)
-    FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
-  ENDIF (NOT TEST_ERRREF)
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif (TEST_MASK_MOD)
+
+if (TEST_MASK_ERROR)
+  if (NOT TEST_ERRREF)
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  else (NOT TEST_ERRREF)
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  endif (NOT TEST_ERRREF)
   STRING(REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE " line [0-9]*" " line (number)" TEST_STREAM "${TEST_STREAM}") 
@@ -89,105 +89,105 @@ IF (TEST_MASK_ERROR)
   STRING(REGEX REPLACE "[1-9]*[.][0-9]*[.][0-9]*[^)]*" "version (number)" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") 
-  IF (NOT TEST_ERRREF)
-    FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-  ELSE (NOT TEST_ERRREF)
-    FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
-  ENDIF (NOT TEST_ERRREF)
-ENDIF (TEST_MASK_ERROR)
-
-IF (TEST_FILTER)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  if (NOT TEST_ERRREF)
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+  else (NOT TEST_ERRREF)
+    file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
+  endif (NOT TEST_ERRREF)
+endif (TEST_MASK_ERROR)
+
+if (TEST_FILTER)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "${TEST_FILTER}" "" TEST_STREAM "${TEST_STREAM}") 
-  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
-ENDIF (TEST_FILTER)
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+endif (TEST_FILTER)
 
-IF (NOT TEST_SKIP_COMPARE)
-  IF (WIN32 AND NOT MINGW)
-    FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-    FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-  ENDIF (WIN32 AND NOT MINGW)
+if (NOT TEST_SKIP_COMPARE)
+  if (WIN32 AND NOT MINGW)
+    file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+    file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+  endif (WIN32 AND NOT MINGW)
 
   # now compare the output with the reference
   EXECUTE_PROCESS (
       COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
       RESULT_VARIABLE TEST_RESULT
   )
-  IF (NOT ${TEST_RESULT} STREQUAL 0)
-  SET (TEST_RESULT 0)
-  FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+  if (NOT ${TEST_RESULT} STREQUAL 0)
+  set (TEST_RESULT 0)
+  file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
   LIST (LENGTH test_act len_act)
-  FILE (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+  file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
   LIST (LENGTH test_ref len_ref)
-  IF (NOT ${len_act} STREQUAL "0")
+  if (NOT ${len_act} STREQUAL "0")
     MATH (EXPR _FP_LEN "${len_ref} - 1")
-    FOREACH (line RANGE 0 ${_FP_LEN})
+    foreach (line RANGE 0 ${_FP_LEN})
       LIST (GET test_act ${line} str_act)
       LIST (GET test_ref ${line} str_ref)
-      IF (NOT "${str_act}" STREQUAL "${str_ref}")
-        IF (NOT "${str_act}" STREQUAL "")
-          SET (TEST_RESULT 1)
-          MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-         ENDIF (NOT "${str_act}" STREQUAL "")
-      ENDIF (NOT "${str_act}" STREQUAL "${str_ref}")
-    ENDFOREACH (line RANGE 0 ${_FP_LEN})
-  ENDIF (NOT ${len_act} STREQUAL "0")
-  IF (NOT ${len_act} STREQUAL ${len_ref})
-    SET (TEST_RESULT 1)
-  ENDIF (NOT ${len_act} STREQUAL ${len_ref})
-  ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
-
-  MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
+      if (NOT "${str_act}" STREQUAL "${str_ref}")
+        if (NOT "${str_act}" STREQUAL "")
+          set (TEST_RESULT 1)
+          message ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+         endif (NOT "${str_act}" STREQUAL "")
+      endif (NOT "${str_act}" STREQUAL "${str_ref}")
+    endforeach (line RANGE 0 ${_FP_LEN})
+  endif (NOT ${len_act} STREQUAL "0")
+  if (NOT ${len_act} STREQUAL ${len_ref})
+    set (TEST_RESULT 1)
+  endif (NOT ${len_act} STREQUAL ${len_ref})
+  endif (NOT ${TEST_RESULT} STREQUAL 0)
+
+  message (STATUS "COMPARE Result: ${TEST_RESULT}")
 
   # again, if return value is !=0 scream and shout
-  IF (NOT ${TEST_RESULT} STREQUAL 0)
-    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
-  ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
+  if (NOT ${TEST_RESULT} STREQUAL 0)
+    message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
+  endif (NOT ${TEST_RESULT} STREQUAL 0)
   
-  IF (TEST_ERRREF)
-    IF (WIN32 AND NOT MINGW)
-      FILE (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-      FILE (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
-    ENDIF (WIN32 AND NOT MINGW)
+  if (TEST_ERRREF)
+    if (WIN32 AND NOT MINGW)
+      file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+      file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
+    endif (WIN32 AND NOT MINGW)
 
     # now compare the error output with the error reference
     EXECUTE_PROCESS (
         COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF}
         RESULT_VARIABLE TEST_RESULT
     )
-    IF (NOT ${TEST_RESULT} STREQUAL 0)
-    SET (TEST_RESULT 0)
-    FILE (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
+    if (NOT ${TEST_RESULT} STREQUAL 0)
+    set (TEST_RESULT 0)
+    file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT}.err test_act)
     LIST (LENGTH test_act len_act)
-    FILE (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
+    file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
     LIST (LENGTH test_ref len_ref)
     MATH (EXPR _FP_LEN "${len_ref} - 1")
-    IF (NOT ${len_act} STREQUAL "0")
+    if (NOT ${len_act} STREQUAL "0")
       MATH (EXPR _FP_LEN "${len_ref} - 1")
-      FOREACH (line RANGE 0 ${_FP_LEN})
+      foreach (line RANGE 0 ${_FP_LEN})
         LIST (GET test_act ${line} str_act)
         LIST (GET test_ref ${line} str_ref)
-        IF (NOT "${str_act}" STREQUAL "${str_ref}")
-          IF (NOT "${str_act}" STREQUAL "")
-            SET (TEST_RESULT 1)
-            MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-           ENDIF (NOT "${str_act}" STREQUAL "")
-        ENDIF (NOT "${str_act}" STREQUAL "${str_ref}")
-      ENDFOREACH (line RANGE 0 ${_FP_LEN})
-    ENDIF (NOT ${len_act} STREQUAL "0")
-    IF (NOT ${len_act} STREQUAL ${len_ref})
-      SET (TEST_RESULT 1)
-    ENDIF (NOT ${len_act} STREQUAL ${len_ref})
-    ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
-
-    MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
+        if (NOT "${str_act}" STREQUAL "${str_ref}")
+          if (NOT "${str_act}" STREQUAL "")
+            set (TEST_RESULT 1)
+            message ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+           endif (NOT "${str_act}" STREQUAL "")
+        endif (NOT "${str_act}" STREQUAL "${str_ref}")
+      endforeach (line RANGE 0 ${_FP_LEN})
+    endif (NOT ${len_act} STREQUAL "0")
+    if (NOT ${len_act} STREQUAL ${len_ref})
+      set (TEST_RESULT 1)
+    endif (NOT ${len_act} STREQUAL ${len_ref})
+    endif (NOT ${TEST_RESULT} STREQUAL 0)
+
+    message (STATUS "COMPARE Result: ${TEST_RESULT}")
 
     # again, if return value is !=0 scream and shout
-    IF (NOT ${TEST_RESULT} STREQUAL 0)
-      MESSAGE (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
-    ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
-  ENDIF (TEST_ERRREF)
-ENDIF (NOT TEST_SKIP_COMPARE)
+    if (NOT ${TEST_RESULT} STREQUAL 0)
+      message (FATAL_ERROR "Failed: The error output of ${TEST_OUTPUT}.err did not match ${TEST_ERRREF}")
+    endif (NOT ${TEST_RESULT} STREQUAL 0)
+  endif (TEST_ERRREF)
+endif (NOT TEST_SKIP_COMPARE)
 
 # everything went fine...
-MESSAGE ("Passed: The output of ${TEST_PROGRAM} matches ${TEST_REFERENCE}")
+message ("Passed: The output of ${TEST_PROGRAM} matches ${TEST_REFERENCE}")
diff --git a/config/cmake/userblockTest.cmake b/config/cmake/userblockTest.cmake
index 8910bb2..2e0740b 100644
--- a/config/cmake/userblockTest.cmake
+++ b/config/cmake/userblockTest.cmake
@@ -2,44 +2,44 @@
 # against a reference file. Exit status of command can also be compared.
 
 # arguments checking
-IF (NOT TEST_PROGRAM)
-  MESSAGE (FATAL_ERROR "Require TEST_PROGRAM tellub to be defined")
-ENDIF (NOT TEST_PROGRAM)
-IF (NOT TEST_GET_PROGRAM)
-  MESSAGE (FATAL_ERROR "Require TEST_GET_PROGRAM getub to be defined")
-ENDIF (NOT TEST_GET_PROGRAM)
-IF (NOT TEST_FOLDER)
-  MESSAGE ( FATAL_ERROR "Require TEST_FOLDER to be defined")
-ENDIF (NOT TEST_FOLDER)
-IF (NOT TEST_HFILE)
-  MESSAGE (FATAL_ERROR "Require TEST_HFILE the hdf file to be defined")
-ENDIF (NOT TEST_HFILE)
-IF (NOT TEST_UFILE)
-  MESSAGE (FATAL_ERROR "Require TEST_UFILE the ub file to be defined")
-ENDIF (NOT TEST_UFILE)
-IF (NOT TEST_CHECKUB)
-  MESSAGE (STATUS "Require TEST_CHECKUB - YES or NO - to be defined")
-ENDIF (NOT TEST_CHECKUB)
-#IF (NOT TEST_EXPECT)
-#  MESSAGE (STATUS "Require TEST_EXPECT to be defined")
-#ENDIF (NOT TEST_EXPECT)
-#IF (NOT TEST_OFILE)
-#  MESSAGE (FATAL_ERROR "Require TEST_OFILE the original hdf file to be defined")
-#ENDIF (NOT TEST_OFILE)
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM tellub to be defined")
+endif (NOT TEST_PROGRAM)
+if (NOT TEST_GET_PROGRAM)
+  message (FATAL_ERROR "Require TEST_GET_PROGRAM getub to be defined")
+endif (NOT TEST_GET_PROGRAM)
+if (NOT TEST_FOLDER)
+  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif (NOT TEST_FOLDER)
+if (NOT TEST_HFILE)
+  message (FATAL_ERROR "Require TEST_HFILE the hdf file to be defined")
+endif (NOT TEST_HFILE)
+if (NOT TEST_UFILE)
+  message (FATAL_ERROR "Require TEST_UFILE the ub file to be defined")
+endif (NOT TEST_UFILE)
+if (NOT TEST_CHECKUB)
+  message (STATUS "Require TEST_CHECKUB - YES or NO - to be defined")
+endif (NOT TEST_CHECKUB)
+#if (NOT TEST_EXPECT)
+#  message (STATUS "Require TEST_EXPECT to be defined")
+#endif (NOT TEST_EXPECT)
+#if (NOT TEST_OFILE)
+#  message (FATAL_ERROR "Require TEST_OFILE the original hdf file to be defined")
+#endif (NOT TEST_OFILE)
 
-SET (TEST_U_STRING_LEN 0)
-SET (TEST_O_STRING_LEN 0)
-SET (TEST_H_STRING_LEN 0)
-SET (TEST_STRING_SIZE 0)
+set (TEST_U_STRING_LEN 0)
+set (TEST_O_STRING_LEN 0)
+set (TEST_H_STRING_LEN 0)
+set (TEST_STRING_SIZE 0)
 
-IF (TEST_CHECKUB STREQUAL "YES")
+if (TEST_CHECKUB STREQUAL "YES")
   # find the length of the user block to check
   #s1=`cat $ufile | wc -c | sed -e 's/ //g'`
-  FILE (STRINGS ${TEST_FOLDER}/${TEST_UFILE} TEST_U_STRING)
-  STRING (LENGTH ${TEST_U_STRING} TEST_U_STRING_LEN)
+  file (STRINGS ${TEST_FOLDER}/${TEST_UFILE} TEST_U_STRING)
+  string (LENGTH ${TEST_U_STRING} TEST_U_STRING_LEN)
 
   # Get the size of the original user block, if any.
-  IF (TEST_OFILE)
+  if (TEST_OFILE)
     # 'tellub' calls H5Fget_user_block to get the size
     #  of the user block
     #s2=`$JAM_BIN/tellub $origfile`
@@ -51,15 +51,15 @@ IF (TEST_CHECKUB STREQUAL "YES")
         OUTPUT_VARIABLE TEST_ERROR
         ERROR_VARIABLE TEST_ERROR
     )
-    IF (NOT ${TEST_RESULT} STREQUAL "0")
-      MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} ${TEST_OFILE} is: ${TEST_ERROR}")
-    ENDIF (NOT ${TEST_RESULT} STREQUAL "0")
-    FILE (READ ${TEST_HFILE}.len.txt TEST_O_STRING_LEN)
-  ENDIF (TEST_OFILE)
+    if (NOT ${TEST_RESULT} STREQUAL "0")
+      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} ${TEST_OFILE} is: ${TEST_ERROR}")
+    endif (NOT ${TEST_RESULT} STREQUAL "0")
+    file (READ ${TEST_HFILE}.len.txt TEST_O_STRING_LEN)
+  endif (TEST_OFILE)
    
   MATH( EXPR TEST_STRING_SIZE "${TEST_U_STRING_LEN} + ${TEST_O_STRING_LEN}" )
  
-  IF (NOT TEST_O_STRING_LEN STREQUAL "0")
+  if (NOT TEST_O_STRING_LEN STREQUAL "0")
     #$JAM_BIN/getub -c $s2 $origfile > $cmpfile
     EXECUTE_PROCESS (
         COMMAND ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
@@ -71,12 +71,12 @@ IF (TEST_CHECKUB STREQUAL "YES")
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     #cat $ufile >> $cmpfile
-    FILE (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
-    FILE (APPEND ${TEST_HFILE}-ub.cmp "${TEST_STREAM}") 
-  ELSE (NOT TEST_O_STRING_LEN STREQUAL "0")
-    FILE (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
-    FILE (WRITE ${TEST_HFILE}-ub.cmp ${TEST_STREAM})
-  ENDIF (NOT TEST_O_STRING_LEN STREQUAL "0")
+    file (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
+    file (APPEND ${TEST_HFILE}-ub.cmp "${TEST_STREAM}") 
+  else (NOT TEST_O_STRING_LEN STREQUAL "0")
+    file (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
+    file (WRITE ${TEST_HFILE}-ub.cmp ${TEST_STREAM})
+  endif (NOT TEST_O_STRING_LEN STREQUAL "0")
 
   #$JAM_BIN/getub -c $size $hfile > $tfile
   EXECUTE_PROCESS (
@@ -95,12 +95,12 @@ IF (TEST_CHECKUB STREQUAL "YES")
       RESULT_VARIABLE TEST_RESULT
   )
 
-  MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}+${TEST_O_STRING_LEN}")
+  message (STATUS "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}+${TEST_O_STRING_LEN}")
   # if the return value is !=${TEST_EXPECT} bail out
-  IF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
-    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_HFILE}-ub did not match ${TEST_HFILE}.\n${TEST_ERROR}")
-  ENDIF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
-ELSE (TEST_CHECKUB STREQUAL "YES")
+  if (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
+    message (FATAL_ERROR "Failed: The output of ${TEST_HFILE}-ub did not match ${TEST_HFILE}.\n${TEST_ERROR}")
+  endif (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
+else (TEST_CHECKUB STREQUAL "YES")
     # call 'ubsize' to get the size of the user block
     #ubsize=`$JAM_BIN/tellub $hfile`
     EXECUTE_PROCESS (
@@ -110,11 +110,11 @@ ELSE (TEST_CHECKUB STREQUAL "YES")
         OUTPUT_VARIABLE TEST_ERROR
         ERROR_VARIABLE TEST_ERROR
     )
-  IF (NOT TEST_H_STRING_LEN STREQUAL "0")
-    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_HFILE} was NOT empty")
-  ENDIF (NOT TEST_H_STRING_LEN STREQUAL "0")
-ENDIF (TEST_CHECKUB STREQUAL "YES")
+  if (NOT TEST_H_STRING_LEN STREQUAL "0")
+    message (FATAL_ERROR "Failed: The output of ${TEST_HFILE} was NOT empty")
+  endif (NOT TEST_H_STRING_LEN STREQUAL "0")
+endif (TEST_CHECKUB STREQUAL "YES")
 
 # everything went fine...
-MESSAGE ("Passed: The output of CHECK matched expectation")
+message ("Passed: The output of CHECK matched expectation")
 
diff --git a/config/cmake/version.plist.in b/config/cmake/version.plist.in
new file mode 100644
index 0000000..817d89e
--- /dev/null
+++ b/config/cmake/version.plist.in
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+
+<plist version="1.0">
+<dict>
+    <key>BuildVersion</key>
+    <string>@CPACK_PACKAGE_VERSION_MAJOR@</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@CPACK_APPLE_GUI_SHORT_VERSION_STRING@</string>
+    <key>CFBundleVersion</key>
+    <string>@CPACK_APPLE_GUI_SHORT_VERSION_STRING@</string>
+    <key>ProjectName</key>
+    <string>@CPACK_APPLE_GUI_BUNDLE_NAME@</string>
+    <key>SourceVersion</key>
+    <string>@CPACK_PACKAGE_VERSION_MINOR@</string>
+</dict>
+</plist>
diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake
index 2e854fb..d3cb87e 100644
--- a/config/cmake/vfdTest.cmake
+++ b/config/cmake/vfdTest.cmake
@@ -2,27 +2,27 @@
 # Exit status of command can also be compared.
 
 # arguments checking
-IF (NOT TEST_PROGRAM)
-  MESSAGE (FATAL_ERROR "Require TEST_PROGRAM to be defined")
-ENDIF (NOT TEST_PROGRAM)
-#IF (NOT TEST_ARGS)
-#  MESSAGE (STATUS "Require TEST_ARGS to be defined")
-#ENDIF (NOT TEST_ARGS)
-#IF (NOT TEST_EXPECT)
-#  MESSAGE (STATUS "Require TEST_EXPECT to be defined")
-#ENDIF (NOT TEST_EXPECT)
-IF (NOT TEST_FOLDER)
-  MESSAGE ( FATAL_ERROR "Require TEST_FOLDER to be defined")
-ENDIF (NOT TEST_FOLDER)
-IF (NOT TEST_VFD)
-  MESSAGE (FATAL_ERROR "Require TEST_VFD to be defined")
-ENDIF (NOT TEST_VFD)
-
-SET (ERROR_APPEND 1)
-
-MESSAGE (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
-
-SET (ENV{HDF5_DRIVER} "${TEST_VFD}")
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif (NOT TEST_PROGRAM)
+#if (NOT TEST_ARGS)
+#  message (STATUS "Require TEST_ARGS to be defined")
+#endif (NOT TEST_ARGS)
+#if (NOT TEST_EXPECT)
+#  message (STATUS "Require TEST_EXPECT to be defined")
+#endif (NOT TEST_EXPECT)
+if (NOT TEST_FOLDER)
+  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif (NOT TEST_FOLDER)
+if (NOT TEST_VFD)
+  message (FATAL_ERROR "Require TEST_VFD to be defined")
+endif (NOT TEST_VFD)
+
+set (ERROR_APPEND 1)
+
+message (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+
+set (ENV{HDF5_DRIVER} "${TEST_VFD}")
 # run the test program, capture the stdout/stderr and the result var
 EXECUTE_PROCESS (
     COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
@@ -33,18 +33,18 @@ EXECUTE_PROCESS (
     ERROR_VARIABLE TEST_ERROR
 )
 
-MESSAGE (STATUS "COMMAND Result: ${TEST_RESULT}")
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
 
-IF (ERROR_APPEND)
-  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err TEST_STREAM)
-  FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}") 
-ENDIF (ERROR_APPEND)
+if (ERROR_APPEND)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err TEST_STREAM)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}") 
+endif (ERROR_APPEND)
 
 # if the return value is !=${TEST_EXPECT} bail out
-IF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
-  MESSAGE ( FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
-ENDIF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
+if (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
+  message ( FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
+endif (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
 
 # everything went fine...
-MESSAGE ("Passed: The ${TEST_PROGRAM} program used vfd ${TEST_VFD}")
+message ("Passed: The ${TEST_PROGRAM} program used vfd ${TEST_VFD}")
 
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 390a8f4..9bc5f0a 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 162
+LT_VERS_REVISION = 166
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and