Merge of HDFFV-10845, 10529 from develop

19 files changed, 486 insertions, 412 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 9f5262f..4d65cde 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -41,19 +41,56 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5TEST-err_compat       #uses runTest.cmake
     H5TEST-links_env        #uses runTest.cmake
     H5TEST-testlibinfo      #uses grepTest.cmake
-    H5TEST-clear-testhdf5-objects
+    #########
     H5TEST-clear-objects
-    H5TEST-clear-cache-objects
-    H5TEST-clear-cache_api-objects
-    H5TEST-clear-cache_tagging-objects
-    H5TEST-clear-ttsafe-objects
-    H5TEST-clear-err_compat-objects
-    H5TEST-clear-error_test-objects
-    H5TEST-clear-links_env-objects
+    H5TEST-cache-clear-objects
+    H5TEST-cache_image-clear-objects
+    H5TEST-del_many_dense_attrs-clear-objects
+    H5TEST-external_env-clear-objects
+    H5TEST-filenotclosed-clear-objects
+    H5TEST-flush-clear-objects
+    H5TEST-links_env-clear-objects
+    H5TEST-testflushrefresh-clear-objects
+    H5TEST-testhdf5-clear-objects
+    H5TEST-vds_env-clear-objects
     PERFORM_h5perform-clear-objects
-    HL_TOOLS-clear-objects
     HL_test-clear-objects
-    HL_fortran_test-clear-objects
+    HL_FORTRAN_test-clear-objects
+    FORTRAN_testhdf5-clear-objects
+    FORTRAN_flush1-clear-objects
+    CPP_testhdf5-clear-objects
+    ######### examples #########
+    EXAMPLES-clear-objects
+    CPP_ex-clear-objects
+    CPP_ex_tutr-clear-objects
+    HL_ex-clear-objects
+    f90_ex-clear-objects
+    HL_CPP_ptableTest-clear-objects
+    HL_CPP_ex_ptExampleFL-clear-objects
+    HL_FORTRAN_f90_ex-clear-objects
+    ######### tools/h5clear #########
+    H5CLEAR-clearall-objects
+    H5CLEAR-copy_h5clear_fsm_persist_equal.h5
+    H5CLEAR-copy_h5clear_fsm_persist_greater.h5
+    H5CLEAR-copy_h5clear_fsm_persist_less.h5
+    H5CLEAR-copy_h5clear_fsm_persist_noclose.h5
+    H5CLEAR-copy_h5clear_fsm_persist_user_equal.h5
+    H5CLEAR-copy_h5clear_fsm_persist_user_greater.h5
+    H5CLEAR-copy_h5clear_fsm_persist_user_less.h5
+    H5CLEAR-copy_h5clear_log_v3.h5
+    H5CLEAR-copy_h5clear_mdc_image.h5
+    H5CLEAR-copy_h5clear_sec2_v0.h5
+    H5CLEAR-copy_h5clear_sec2_v2.h5
+    H5CLEAR-copy_h5clear_sec2_v3.h5
+    H5CLEAR-copy_h5clear_status_noclear.h5
+    H5CLEAR-copy_latest_h5clear_log_v3.h5
+    H5CLEAR-copy_latest_h5clear_sec2_v3.h5
+    H5CLEAR-copy_mod_h5clear_mdc_image.h5
+    H5CLEAR-copy_mod_h5clr_mdc_image2.h5
+    H5CLEAR-copy_orig_h5clear_sec2_v0.h5
+    H5CLEAR-copy_orig_h5clear_sec2_v2.h5
+    H5CLEAR-copy_orig_h5clear_sec2_v3.h5
+    H5CLEAR-h5clear_gentest      # does not close ids by design
     ######### tools/h5copy #########
     H5COPY-clearall-objects
     ######### tools/h5diff #########
@@ -66,140 +103,71 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5IMPORT-h5importtest-clear-objects
     H5IMPORT-clear-objects
     ######### tools/h5jam #########
-    H5JAM-SETUP-N_twithub_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub_u10_c
-    H5JAM-N_twithub_u10_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u10_c
-    H5JAM-CHECKFILE-N_twithub_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub_u511_c
-    H5JAM-N_twithub_u511_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u511_c
-    H5JAM-CHECKFILE-N_twithub_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub_u512_c
-    H5JAM-N_twithub_u512_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u512_c
-    H5JAM-CHECKFILE-N_twithub_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub_u513_c
-    H5JAM-N_twithub_u513_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub_u513_c
-    H5JAM-CHECKFILE-N_twithub_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u10_c
-    H5JAM-N_twithub513_u10_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u10_c
-    H5JAM-CHECKFILE-N_twithub513_u10_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u511_c
-    H5JAM-N_twithub513_u511_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u511_c
-    H5JAM-CHECKFILE-N_twithub513_u511_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u512_c
-    H5JAM-N_twithub513_u512_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u512_c
-    H5JAM-CHECKFILE-N_twithub513_u512_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u513_c-clear-objects
-    H5JAM-SETUP-N_twithub513_u513_c
-    H5JAM-N_twithub513_u513_c-clear-objects
-    H5JAM-NONE_COPY-N_twithub513_u513_c
-    H5JAM-CHECKFILE-N_twithub513_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u10_c-clear-objects
-    H5JAM-twithub_u511_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u511_c-clear-objects
-    H5JAM-twithub_u512_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u512_c-clear-objects
-    H5JAM-twithub_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub_u513_c-clear-objects
-    H5JAM-twithub513_u10_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u10_c-clear-objects
-    H5JAM-twithub513_u511_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u511_c-clear-objects
-    H5JAM-twithub513_u512_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u512_c-clear-objects
-    H5JAM-twithub513_u513_c-clear-objects
-    H5JAM-CHECKFILE-twithub513_u513_c-clear-objects
-    H5JAM-SETUP-twithub_tall-clear-objects
-    H5JAM-SETUP-twithub_tall
-    H5JAM-UNJAM-twithub_tall-clear-objects
-    H5JAM-UNJAM_D-twithub_tall-clear-objects
-    H5JAM-CHECKFILE-twithub_tall-clear-objects
-    H5JAM-SETUP-twithub513_tall-clear-objects
-    H5JAM-SETUP-twithub513_tall
-    H5JAM-UNJAM-twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-twithub513_tall-clear-objects
-    H5JAM-SETUP-N_twithub_tall-clear-objects
-    H5JAM-SETUP-N_twithub_tall
-    H5JAM-UNJAM-N_twithub_tall-clear-objects
-    H5JAM-UNJAM_D-N_twithub_tall-clear-objects
-    H5JAM-CHECKFILE-N_twithub_tall-clear-objects
-    H5JAM-SETUP-N_twithub513_tall-clear-objects
-    H5JAM-SETUP-N_twithub513_tall
-    H5JAM-UNJAM-N_twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-N_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-N_twithub513_tall-clear-objects
-    H5JAM-SETUP-D_twithub_tall-clear-objects
-    H5JAM-SETUP-D_twithub_tall
-    H5JAM-UNJAM-D_twithub_tall-clear-objects
-    H5JAM-UNJAM_D-D_twithub_tall-clear-objects
-    H5JAM-CHECKFILE-D_twithub_tall-clear-objects
-    H5JAM-SETUP-D_twithub513_tall-clear-objects
-    H5JAM-SETUP-D_twithub513_tall
-    H5JAM-UNJAM-D_twithub513_tall-clear-objects
-    H5JAM-UNJAM_D-D_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-D_twithub513_tall-clear-objects
-    H5JAM-CHECKFILE-ta_u513-clear-objects
-    H5JAM-twithub_u10-clear-objects
-    H5JAM-CHECKFILE-twithub_u10-clear-objects
-    H5JAM-twithub_u511-clear-objects
-    H5JAM-CHECKFILE-twithub_u511-clear-objects
-    H5JAM-twithub_u512-clear-objects
-    H5JAM-CHECKFILE-twithub_u512-clear-objects
-    H5JAM-twithub_u513-clear-objects
-    H5JAM-CHECKFILE-twithub_u513-clear-objects
-    H5JAM-twithub513_u10-clear-objects
-    H5JAM-CHECKFILE-twithub513_u10-clear-objects
-    H5JAM-twithub513_u511-clear-objects
-    H5JAM-CHECKFILE-twithub513_u511-clear-objects
-    H5JAM-twithub513_u512-clear-objects
-    H5JAM-CHECKFILE-twithub513_u512-clear-objects
-    H5JAM-twithub513_u513-clear-objects
-    H5JAM-CHECKFILE-twithub513_u513-clear-objects
-    H5JAM-twithub_u10_c-clear-objects
-    H5JAM-tall_u10-clear-objects
-    H5JAM-CHECKFILE-tall_u10-clear-objects
-    H5JAM-tall_u511-clear-objects
-    H5JAM-CHECKFILE-tall_u511-clear-objects
-    H5JAM-tall_u512-clear-objects
-    H5JAM-CHECKFILE-tall_u512-clear-objects
-    H5JAM-tall_u513-clear-objects
-    H5JAM-CHECKFILE-tall_u513-clear-objects
-    H5JAM-SETUP-ta_u10-clear-objects
-    H5JAM-SETUP-ta_u10
-    H5JAM-ta_u10-clear-objects
-    H5JAM-NONE_COPY-ta_u10
-    H5JAM-CHECKFILE-ta_u10-clear-objects
-    H5JAM-SETUP-ta_u511-clear-objects
-    H5JAM-SETUP-ta_u511
-    H5JAM-ta_u511-clear-objects
-    H5JAM-NONE_COPY-ta_u511
-    H5JAM-CHECKFILE-ta_u511-clear-objects
-    H5JAM-SETUP-ta_u512-clear-objects
-    H5JAM-SETUP-ta_u512
-    H5JAM-ta_u512-clear-objects
-    H5JAM-NONE_COPY-ta_u512
-    H5JAM-CHECKFILE-ta_u512-clear-objects
-    H5JAM-SETUP-ta_u513-clear-objects
-    H5JAM-SETUP-ta_u513
-    H5JAM-ta_u513-clear-objects
-    H5JAM-NONE_COPY-ta_u513
     ######### tools/h5ls #########
     H5LS-clearall-objects
     ######### tools/h5repack #########
     H5REPACK-clearall-objects
+    H5REPACK-add_alignment-clear-objects
+    H5REPACK-add_userblock-clear-objects
+    H5REPACK-all_filters-clear-objects
+    H5REPACK-attr-clear-objects
+    H5REPACK-committed_dt-clear-objects
+    H5REPACK-deflate_convert-clear-objects
+    H5REPACK-deflate_copy-clear-objects
+    H5REPACK-deflate_file-clear-objects
+    H5REPACK-deflate_remove-clear-objects
+    H5REPACK-early-clear-objects
+    H5REPACK-error4-clear-objects
+    H5REPACK-family-clear-objects
+    H5REPACK-fill-clear-objects
+    H5REPACK-fletcher_all-clear-objects
+    H5REPACK-fletcher_copy-clear-objects
+    H5REPACK-fletcher_individual-clear-objects
+    H5REPACK-fletcher_remove-clear-objects
+    H5REPACK-global_filters-clear-objects
+    H5REPACK-gt_mallocsize-clear-objects
+    H5REPACK-gzip_all-clear-objects
+    H5REPACK-gzip_individual-clear-objects
+    H5REPACK-hlink-clear-objects
+    H5REPACK-layout-clear-objects
+    H5REPACK-native_attr-clear-objects
+    H5REPACK-native_fill-clear-objects
+    H5REPACK-nbit_add-clear-objects
+    H5REPACK-nbit_copy-clear-objects
+    H5REPACK-nbit_remove-clear-objects
+    H5REPACK-nested_8bit_enum-clear-objects
+    H5REPACK-objs-clear-objects
+    H5REPACK-remove_all-clear-objects
+    H5REPACK-scale_add-clear-objects
+    H5REPACK-scale_copy-clear-objects
+    H5REPACK-scale_remove-clear-objects
+    H5REPACK-shuffle_all-clear-objects
+    H5REPACK-shuffle_copy-clear-objects
+    H5REPACK-shuffle_individual-clear-objects
+    H5REPACK-shuffle_remove-clear-objects
+    H5REPACK-szip_all-clear-objects
+    H5REPACK-szip_convert-clear-objects
+    H5REPACK-szip_copy-clear-objects
+    H5REPACK-szip_individual-clear-objects
+    H5REPACK-szip_remove-clear-objects
+    H5REPACK-upgrade_layout-clear-objects
+    H5REPACK_DMP-crtorder-clear-objects
+    H5REPACK_DMP-deflate_limit-clear-objects
+    H5REPACK-bug1814-clear-objects
+    H5REPACK-HDFFV-5932-clear-objects
+    H5REPACK-HDFFV-7840-clear-objects
+    H5REPACK_META-meta_long_N-clear-objects
+    H5REPACK_META-meta_short_N-clear-objects
+    H5REPACK_STAT-GS_AGGR-clear-objects
+    H5REPACK_STAT-S_AGGR-clear-objects
+    H5REPACK_STAT-SP_NONE-clear-objects
+    H5REPACK_STAT-SP_PAGE-clear-objects
+    H5REPACK_STAT-SPT_FSM_AGGR-clear-objects
+    H5REPACK_STAT-STG_PAGE-clear-objects
+    #########
+    H5REPACK_META-meta_long
+    H5REPACK_META-meta_short
+    #########
     H5REPACK-gzip_verbose_filters                       #uses runTest.cmake
     H5REPACK_VERIFY_LAYOUT-dset2_chunk_20x10            #uses grepTest.cmake
     H5REPACK_VERIFY_LAYOUT_ALL-chunk_20x10              #uses grepTest.cmake
@@ -227,11 +195,9 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     ######### tools/misc #########
     H5REPART-clearall-objects
     H5MKGRP-clearall-objects
-    ######### examples #########
-    EXAMPLES-clear-objects
-    CPP_ex-clear-objects
-    CPP_ex_tutr-clear-objects
-    HL_ex-clear-objects
-    f90_ex-clear-objects
-    HL_FORTRAN_f90_ex-clear-objects
+    ######### tools/perform #########
+    PERFORM_h5perform-clearall-objects
+    ######### hl/tools #########
+    HL_TOOLS-clear-objects
+    H5WATCH-clearall-objects
 )
diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
index 0269ba8..e819e58 100644
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
@@ -72,7 +72,7 @@ set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
 if (CTEST_USE_TAR_SOURCE)
   ## Uncompress source if tar or zip file provided
   ## --------------------------
-  if (WIN32)
+  if (WIN32 AND NOT MINGW)
     message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
     execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
   else ()
@@ -101,6 +101,11 @@ endif ()
 include (ProcessorCount)
 ProcessorCount (N)
 if (NOT N EQUAL 0)
+  if (MAX_PROC_COUNT)
+    if (N GREATER MAX_PROC_COUNT)
+      set (N ${MAX_PROC_COUNT})
+    endif ()
+  endif ()
   if (NOT WIN32)
     set (CTEST_BUILD_FLAGS -j${N})
   endif ()
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 3c285dc..3c23375 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -116,7 +116,7 @@ endif ()
 CHECK_FUNCTION_EXISTS (difftime          ${HDF_PREFIX}_HAVE_DIFFTIME)
 
 # Find the library containing clock_gettime()
-if (NOT WINDOWS)
+if (MINGW OR 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)
diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake
index d760904..0aeeea6 100644
--- a/config/cmake/HDF5UseFortran.cmake
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -14,7 +14,8 @@
 # This file provides functions for HDF5 specific Fortran support.
 #
 #-------------------------------------------------------------------------------
-ENABLE_LANGUAGE (Fortran)
+enable_language (Fortran)
+
 set (HDF_PREFIX "H5")
 include (CheckFortranFunctionExists)
 
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index d68e664..a9874c7 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -40,7 +40,8 @@ set (${HDF5_PACKAGE_NAME}_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
-set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)
+set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS    @H5_ENABLE_SHARED_LIB@)
+set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS    @H5_ENABLE_STATIC_LIB@)
 set (${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS      @HDF5_PACKAGE_EXTLIBS@)
 set (${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES @HDF5_LIBRARIES_TO_EXPORT@)
 set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
@@ -105,9 +106,15 @@ endif ()
 
 # Handle default component(static) :
 if (NOT ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
+  if (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS)
     set (${HDF5_PACKAGE_NAME}_LIB_TYPE)
     set (${HDF5_PACKAGE_NAME}_FIND_COMPONENTS C HL static)
     set (${HDF5_PACKAGE_NAME}_FIND_REQUIRED_static_C true)
+  else ()
+    set (${HDF5_PACKAGE_NAME}_LIB_TYPE)
+    set (${HDF5_PACKAGE_NAME}_FIND_COMPONENTS C HL shared)
+    set (${HDF5_PACKAGE_NAME}_FIND_REQUIRED_shared_C true)
+  endif ()
 endif ()
 
 # Handle requested components:
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index ca8b313..c3efbdd 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -43,7 +43,7 @@ Languages:
 @BUILD_FORTRAN_CONDITIONAL_TRUE@               H5 Fortran Flags: @H5_FCFLAGS@
 @BUILD_FORTRAN_CONDITIONAL_TRUE@               AM Fortran Flags: @AM_FCFLAGS@
 @BUILD_FORTRAN_CONDITIONAL_TRUE@         Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: YES
+@BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
 
                             C++: @HDF5_BUILD_CPP_LIB@
 @BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
@@ -51,23 +51,23 @@ Languages:
 @BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @H5_CXXFLAGS@
 @BUILD_CXX_CONDITIONAL_TRUE@                   AM C++ Flags: @AM_CXXFLAGS@
 @BUILD_CXX_CONDITIONAL_TRUE@             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@             Static C++ Library: YES
+@BUILD_CXX_CONDITIONAL_TRUE@             Static C++ Library: @H5_ENABLE_STATIC_LIB@
 
 Features:
 ---------
-                  Parallel HDF5: @HDF5_ENABLE_PARALLEL@
-             High Level library: @HDF5_BUILD_HL_LIB@
-               Build HDF5 Tests: @BUILD_TESTING@
-               Build HDF5 Tools: @HDF5_BUILD_TOOLS@
-                   Threadsafety: @HDF5_ENABLE_THREADSAFE@
-            Default API Mapping: @DEFAULT_API_VERSION@
- With Deprecated Public Symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
-         I/O filters (external): @EXTERNAL_FILTERS@
-                            MPE: @H5_HAVE_LIBLMPE@
-                     Direct VFD: @H5_HAVE_DIRECT@
-                        dmalloc: @H5_HAVE_LIBDMALLOC@
-Clear file buffers before write: @HDF5_Enable_Clear_File_Buffers@
-           Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
-         Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
-      Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
-   Optimization Instrumentation: @HDF5_Enable_Instrument@
+                   Parallel HDF5: @HDF5_ENABLE_PARALLEL@
+              High Level library: @HDF5_BUILD_HL_LIB@
+                Build HDF5 Tests: @BUILD_TESTING@
+                Build HDF5 Tools: @HDF5_BUILD_TOOLS@
+                    Threadsafety: @HDF5_ENABLE_THREADSAFE@
+             Default API mapping: @DEFAULT_API_VERSION@
+  With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
+          I/O filters (external): @EXTERNAL_FILTERS@
+                             MPE: @H5_HAVE_LIBLMPE@
+                      Direct VFD: @H5_HAVE_DIRECT@
+                         dmalloc: @H5_HAVE_LIBDMALLOC@
+ Clear file buffers before write: @HDF5_Enable_Clear_File_Buffers@
+            Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
+          Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
+       Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
+    Optimization Instrumentation: @HDF5_Enable_Instrument@
diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake
index d36f80f..58cb9cc 100644
--- a/config/cmake/mccacheinit.cmake
+++ b/config/cmake/mccacheinit.cmake
@@ -15,6 +15,8 @@
 # EXTERNAL cache entries
 ########################
 
+set (CMAKE_INSTALL_FRAMEWORK_PREFIX "Library/Frameworks" CACHE STRING "Frameworks installation directory" FORCE)
+
 set (BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE)
 
 set (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index eff3899..8ff52ec 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -69,7 +69,7 @@ set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
 if (CTEST_USE_TAR_SOURCE)
   ## Uncompress source if tar file provided
   ## --------------------------
-  if (WIN32)
+  if (WIN32 AND NOT MINGW)
     message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
     execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
   else ()
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 7947f6a..d8196b1 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -43,6 +43,8 @@ set (CTEST_SOURCE_VERSEXT "-snap1")
 #INSTALLDIR - HDF5-1.8 root folder

 #CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo

 #CTEST_SOURCE_NAME - name of source folder; HDF5-1.8.x

+#MODEL - CDash group name
+#MPI - enable MPI
 if (DEFINED CTEST_SCRIPT_ARG)

     # transform ctest script arguments of the form

     # script.ctest,var1=value1,var2=value2

@@ -169,7 +171,9 @@ endif ()
 ###################################################################

 #########       Following is for submission to CDash   ############

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

-set (MODEL "Experimental")

+if (NOT DEFINED MODEL)
+  set (MODEL "Experimental")
+endif ()
 ###################################################################

 

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

@@ -193,7 +197,7 @@ set (REPOSITORY_BRANCH "hdf5_1_8_22")
 

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

 

-if (WIN32)

+if (WIN32 AND NOT MINGW)

   set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}")

   include (${CTEST_SCRIPT_DIRECTORY}\\HDF5options.cmake)

   include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)

diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index 52415f4..5c372ab 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -27,7 +27,9 @@
 #############################################################################################
 ####      Only build static libraries       ####
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
-####      Add PICC option on linux/mac       ####
+####      Only build shared libraries       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DONLY_SHARED_LIBS:BOOL=OFF")
+####      Add PIC option on linux/mac       ####
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
 
 #############################################################################################
@@ -67,11 +69,11 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN
 
 #############################################################################################
 ### enable parallel builds
-
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON")
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=OFF")
-
+if (DEFINED MPI)
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=OFF")
+endif()
 #############################################################################################
 ### enable thread-safety builds
 
diff --git a/config/cmake/userblockTest.cmake b/config/cmake/userblockTest.cmake
index 0e9d01b..c9fc36f 100644
--- a/config/cmake/userblockTest.cmake
+++ b/config/cmake/userblockTest.cmake
@@ -55,7 +55,7 @@ if (TEST_CHECKUB STREQUAL "YES")
     #  of the user block
     #s2=`$JAM_BIN/tellub $origfile`
     EXECUTE_PROCESS (
-        COMMAND ${TEST_PROGRAM} ${TEST_OFILE}
+        COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
         OUTPUT_FILE ${TEST_HFILE}.len.txt
@@ -73,7 +73,7 @@ if (TEST_CHECKUB STREQUAL "YES")
   if (TEST_O_STRING_LEN)
     #$JAM_BIN/getub -c $s2 $origfile > $cmpfile
     EXECUTE_PROCESS (
-        COMMAND ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
+        COMMAND ${TEST_EMULATOR} ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
         OUTPUT_FILE ${TEST_HFILE}-ub.cmp
@@ -91,7 +91,7 @@ if (TEST_CHECKUB STREQUAL "YES")
 
   #$JAM_BIN/getub -c $size $hfile > $tfile
   EXECUTE_PROCESS (
-      COMMAND ${TEST_GET_PROGRAM} -c ${TEST_STRING_SIZE} ${TEST_HFILE}
+      COMMAND ${TEST_EMULATOR} ${TEST_GET_PROGRAM} -c ${TEST_STRING_SIZE} ${TEST_HFILE}
       WORKING_DIRECTORY ${TEST_FOLDER}
       RESULT_VARIABLE TEST_RESULT
       OUTPUT_FILE ${TEST_HFILE}.cmp
@@ -115,7 +115,7 @@ else ()
     # call 'ubsize' to get the size of the user block
     #ubsize=`$JAM_BIN/tellub $hfile`
     EXECUTE_PROCESS (
-        COMMAND ${TEST_PROGRAM} ${TEST_HFILE}
+        COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_HFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_H_STRING_LEN
         OUTPUT_VARIABLE TEST_OUT
diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake
index 8e186e9..3556d07 100644
--- a/config/cmake/vfdTest.cmake
+++ b/config/cmake/vfdTest.cmake
@@ -36,13 +36,13 @@ endif ()
 #  set (ERROR_APPEND 1)
 #endif ()
 
-message (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+message (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_EMULATOR} ${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}
+    COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
     WORKING_DIRECTORY ${TEST_FOLDER}
     RESULT_VARIABLE TEST_RESULT
     OUTPUT_FILE ${TEST_OUTPUT}_${TEST_VFD}.out
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index fc867a4..abc88ed 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -28,7 +28,7 @@ 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"
+    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.")
@@ -61,17 +61,17 @@ endmacro ()
 # ----------------------------------------------------------------------
 # WINDOWS Hard code Values
 # ----------------------------------------------------------------------
-
 set (WINDOWS)
-if (WIN32)
-  if (MINGW)
-    set (${HDF_PREFIX}_HAVE_MINGW 1)
-    set (WINDOWS 1) # MinGW tries to imitate Windows
-    set (CMAKE_REQUIRED_FLAGS "-DWIN32_LEAN_AND_MEAN=1 -DNOGDI=1")
-  endif ()
-  set (${HDF_PREFIX}_HAVE_WIN32_API 1)
-  set (HDF5_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib")
-  if (NOT UNIX AND NOT MINGW)
+
+if (MINGW)
+  set (${HDF_PREFIX}_HAVE_MINGW 1)
+  set (WINDOWS 1) # MinGW tries to imitate Windows
+  set (CMAKE_REQUIRED_FLAGS "-DWIN32_LEAN_AND_MEAN=1 -DNOGDI=1")
+  set (${HDF_PREFIX}_HAVE_WINSOCK2_H 1)
+endif ()
+
+if (WIN32 AND NOT MINGW)
+  if (NOT UNIX)
     set (WINDOWS 1)
     set (CMAKE_REQUIRED_FLAGS "/DWIN32_LEAN_AND_MEAN=1 /DNOGDI=1")
     if (MSVC)
@@ -81,6 +81,8 @@ if (WIN32)
 endif ()
 
 if (WINDOWS)
+  set (HDF5_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib")
+  set (${HDF_PREFIX}_HAVE_WIN32_API 1)
   set (${HDF_PREFIX}_HAVE_STDDEF_H 1)
   set (${HDF_PREFIX}_HAVE_SYS_STAT_H 1)
   set (${HDF_PREFIX}_HAVE_SYS_TYPES_H 1)
@@ -90,19 +92,16 @@ if (WINDOWS)
   set (${HDF_PREFIX}_HAVE_LONGJMP 1)
   if (NOT MINGW)
     set (${HDF_PREFIX}_HAVE_GETHOSTNAME 1)
+    set (${HDF_PREFIX}_HAVE_FUNCTION 1)
   endif ()
-  if (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
+  if (NOT UNIX AND NOT CYGWIN)
     set (${HDF_PREFIX}_HAVE_GETCONSOLESCREENBUFFERINFO 1)
+    set (${HDF_PREFIX}_GETTIMEOFDAY_GIVES_TZ 1)
+    set (${HDF_PREFIX}_HAVE_TIMEZONE 1)
+    set (${HDF_PREFIX}_HAVE_GETTIMEOFDAY 1)
+    set (${HDF_PREFIX}_HAVE_LIBWS2_32 1)
+    set (${HDF_PREFIX}_HAVE_LIBWSOCK32 1)
   endif ()
-  set (${HDF_PREFIX}_HAVE_FUNCTION 1)
-  set (${HDF_PREFIX}_GETTIMEOFDAY_GIVES_TZ 1)
-  set (${HDF_PREFIX}_HAVE_TIMEZONE 1)
-  set (${HDF_PREFIX}_HAVE_GETTIMEOFDAY 1)
-  if (MINGW)
-    set (${HDF_PREFIX}_HAVE_WINSOCK2_H 1)
-  endif ()
-  set (${HDF_PREFIX}_HAVE_LIBWS2_32 1)
-  set (${HDF_PREFIX}_HAVE_LIBWSOCK32 1)
 endif ()
 
 # ----------------------------------------------------------------------
@@ -188,7 +187,7 @@ endif ()
 #-----------------------------------------------------------------------------
 #  Check for the math library "m"
 #-----------------------------------------------------------------------------
-if (NOT WINDOWS)
+if (MINGW OR NOT WINDOWS)
   CHECK_LIBRARY_EXISTS_CONCAT ("m" ceil     ${HDF_PREFIX}_HAVE_LIBM)
   CHECK_LIBRARY_EXISTS_CONCAT ("dl" dlopen     ${HDF_PREFIX}_HAVE_LIBDL)
   CHECK_LIBRARY_EXISTS_CONCAT ("ws2_32" WSAStartup  ${HDF_PREFIX}_HAVE_LIBWS2_32)
@@ -264,7 +263,7 @@ set (LINUX_LFS 0)
 
 set (HDF_EXTRA_C_FLAGS)
 set (HDF_EXTRA_FLAGS)
-if (NOT WINDOWS)
+if (MINGW OR NOT WINDOWS)
   # Might want to check explicitly for Linux and possibly Cygwin
   # instead of checking for not Solaris or Darwin.
   if (NOT ${HDF_PREFIX}_HAVE_SOLARIS AND NOT ${HDF_PREFIX}_HAVE_DARWIN)
@@ -324,21 +323,16 @@ endif ()
 #-----------------------------------------------------------------------------
 # Check for HAVE_OFF64_T functionality
 #-----------------------------------------------------------------------------
-if (NOT WINDOWS OR MINGW)
+if (MINGW OR NOT WINDOWS)
   HDF_FUNCTION_TEST (HAVE_OFF64_T)
   if (${HDF_PREFIX}_HAVE_OFF64_T)
     CHECK_FUNCTION_EXISTS (lseek64            ${HDF_PREFIX}_HAVE_LSEEK64)
-    CHECK_FUNCTION_EXISTS (fseeko64           ${HDF_PREFIX}_HAVE_FSEEKO64)
-    CHECK_FUNCTION_EXISTS (ftello64           ${HDF_PREFIX}_HAVE_FTELLO64)
-    CHECK_FUNCTION_EXISTS (ftruncate64        ${HDF_PREFIX}_HAVE_FTRUNCATE64)
   endif ()
 
   CHECK_FUNCTION_EXISTS (fseeko               ${HDF_PREFIX}_HAVE_FSEEKO)
-  CHECK_FUNCTION_EXISTS (ftello               ${HDF_PREFIX}_HAVE_FTELLO)
 
   HDF_FUNCTION_TEST (HAVE_STAT64_STRUCT)
   if (HAVE_STAT64_STRUCT)
-    CHECK_FUNCTION_EXISTS (fstat64            ${HDF_PREFIX}_HAVE_FSTAT64)
     CHECK_FUNCTION_EXISTS (stat64             ${HDF_PREFIX}_HAVE_STAT64)
   endif ()
 endif ()
@@ -408,7 +402,7 @@ if (NOT APPLE)
   if (NOT ${HDF_PREFIX}_SIZEOF_SSIZE_T)
     set (${HDF_PREFIX}_SIZEOF_SSIZE_T 0)
   endif ()
-  if (NOT WINDOWS)
+  if (MINGW OR NOT WINDOWS)
     HDF_CHECK_TYPE_SIZE (ptrdiff_t    ${HDF_PREFIX}_SIZEOF_PTRDIFF_T)
   endif ()
 endif ()
@@ -418,6 +412,7 @@ HDF_CHECK_TYPE_SIZE (off64_t        ${HDF_PREFIX}_SIZEOF_OFF64_T)
 if (NOT ${HDF_PREFIX}_SIZEOF_OFF64_T)
   set (${HDF_PREFIX}_SIZEOF_OFF64_T 0)
 endif ()
+HDF_CHECK_TYPE_SIZE (time_t          ${HDF_PREFIX}_SIZEOF_TIME_T)
 
 #-----------------------------------------------------------------------------
 # Extra C99 types
@@ -431,7 +426,7 @@ else ()
   HDF_CHECK_TYPE_SIZE (_Bool        ${HDF_PREFIX}_SIZEOF_BOOL)
 endif ()
 
-if (NOT WINDOWS)
+if (MINGW OR NOT WINDOWS)
   #-----------------------------------------------------------------------------
   # Check if the dev_t type is a scalar type
   #-----------------------------------------------------------------------------
@@ -478,7 +473,7 @@ if (NOT WINDOWS)
   CHECK_FUNCTION_EXISTS (_getvideoconfig   ${HDF_PREFIX}_HAVE__GETVIDEOCONFIG)
   CHECK_FUNCTION_EXISTS (gettextinfo       ${HDF_PREFIX}_HAVE_GETTEXTINFO)
   CHECK_FUNCTION_EXISTS (_scrsize          ${HDF_PREFIX}_HAVE__SCRSIZE)
-  if (NOT CYGWIN AND NOT MINGW)
+  if (NOT CYGWIN)
     CHECK_FUNCTION_EXISTS (GetConsoleScreenBufferInfo    ${HDF_PREFIX}_HAVE_GETCONSOLESCREENBUFFERINFO)
   endif ()
   CHECK_SYMBOL_EXISTS (TIOCGWINSZ "sys/ioctl.h" ${HDF_PREFIX}_HAVE_TIOCGWINSZ)
@@ -510,6 +505,8 @@ CHECK_FUNCTION_EXISTS (lround            ${HDF_PREFIX}_HAVE_LROUND)
 CHECK_FUNCTION_EXISTS (lroundf           ${HDF_PREFIX}_HAVE_LROUNDF)
 CHECK_FUNCTION_EXISTS (lstat             ${HDF_PREFIX}_HAVE_LSTAT)
 
+CHECK_FUNCTION_EXISTS (pread             ${HDF_PREFIX}_HAVE_PREAD)
+CHECK_FUNCTION_EXISTS (pwrite            ${HDF_PREFIX}_HAVE_PWRITE)
 CHECK_FUNCTION_EXISTS (rand_r            ${HDF_PREFIX}_HAVE_RAND_R)
 CHECK_FUNCTION_EXISTS (random            ${HDF_PREFIX}_HAVE_RANDOM)
 CHECK_FUNCTION_EXISTS (round             ${HDF_PREFIX}_HAVE_ROUND)
@@ -537,7 +534,7 @@ CHECK_FUNCTION_EXISTS (vasprintf         ${HDF_PREFIX}_HAVE_VASPRINTF)
 CHECK_FUNCTION_EXISTS (waitpid           ${HDF_PREFIX}_HAVE_WAITPID)
 
 CHECK_FUNCTION_EXISTS (vsnprintf         ${HDF_PREFIX}_HAVE_VSNPRINTF)
-if (NOT WINDOWS)
+if (MINGW OR NOT WINDOWS)
   if (${HDF_PREFIX}_HAVE_VSNPRINTF)
     HDF_FUNCTION_TEST (VSNPRINTF_WORKS)
   endif ()
@@ -558,7 +555,7 @@ endif ()
 #-----------------------------------------------------------------------------
 # Check a bunch of other functions
 #-----------------------------------------------------------------------------
-if (NOT WINDOWS)
+if (MINGW OR NOT WINDOWS)
   foreach (other_test
       HAVE_ATTRIBUTE
       HAVE_C99_FUNC
diff --git a/config/cmake_ext_mod/FindSZIP.cmake b/config/cmake_ext_mod/FindSZIP.cmake
index 699be85..2303d6d 100644
--- a/config/cmake_ext_mod/FindSZIP.cmake
+++ b/config/cmake_ext_mod/FindSZIP.cmake
@@ -9,136 +9,108 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
+#########################################################################
+
+# - Derived from the FindTiff.cmake and FindJPEG.cmake that is included with cmake
+# FindSZIP
 
-# - Find SZIP library
-# - Derived from the FindTiff.cmake that is included with cmake
 # Find the native SZIP includes and library
-# This module defines
-#  SZIP_INCLUDE_DIRS, where to find tiff.h, etc.
-#  SZIP_LIBRARIES, libraries to link against to use SZIP.
-#  SZIP_FOUND, If false, do not try to use SZIP.
-#    also defined, but not for general use are
-#  SZIP_LIBRARY, where to find the SZIP library.
-#  SZIP_LIBRARY_DEBUG - Debug version of SZIP library
-#  SZIP_LIBRARY_RELEASE - Release Version of SZIP library
 
-# message (STATUS "Finding SZIP library and headers..." )
+# Imported targets
+##################
 
-############################################
+# This module defines the following :prop_tgt:`IMPORTED` targets:
 #
-# Check the existence of the libraries.
+# SZIP::SZIP
+#  The SZIP library, if found.
 #
-############################################
-# This macro was taken directly from the FindQt4.cmake file that is included
-# with the CMake distribution. This is NOT my work. All work was done by the
-# original authors of the FindQt4.cmake file. Only minor modifications were
-# made to remove references to Qt and make this file more generally applicable
-#########################################################################
+# Result variables
+###################
 
-macro (SZIP_ADJUST_LIB_VARS basename)
-  if (${basename}_INCLUDE_DIR)
+# This module will set the following variables in your project:
 
-    # 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 ()
+#  SZIP_FOUND, true if the SZIP headers and libraries were found.
+#  SZIP_INCLUDE_DIR, the directory containing the SZIP headers.
+#  SZIP_INCLUDE_DIRS, the directory containing the SZIP headers.
+#  SZIP_LIBRARIES, libraries to link against to use SZIP.
 
-    # 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 ()
-    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})
-      else ()
-        # 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 ()
-      set (${basename}_LIBRARIES       optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
-    endif ()
+# Cache variables
+#################
 
-    set (${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH "The ${basename} library")
+# The following variables may also be set:
 
-    if (${basename}_LIBRARY)
-      set (${basename}_FOUND 1)
-    endif ()
-  endif ()
+#  SZIP_LIBRARY, where to find the SZIP library.
+#  SZIP_LIBRARY_DEBUG - Debug version of SZIP library
+#  SZIP_LIBRARY_RELEASE - Release Version of SZIP library
 
-  # Make variables changeble to the advanced user
-  MARK_AS_ADVANCED (${basename}_LIBRARY ${basename}_LIBRARY_RELEASE ${basename}_LIBRARY_DEBUG ${basename}_INCLUDE_DIR )
-endmacro ()
-
-
-# Look for the header file.
-set (SZIP_INCLUDE_SEARCH_DIRS
-    $ENV{SZIP_INSTALL}/include
-    $ENV{SZIP_INSTALL}/include/szip
-    /usr/include
-    /usr/include/szip
-)
-
-set (SZIP_LIB_SEARCH_DIRS
-    $ENV{SZIP_INSTALL}/lib
-    /usr/lib
-)
-
-set (SZIP_BIN_SEARCH_DIRS
-    $ENV{SZIP_INSTALL}/bin
-    /usr/bin
-)
-
-FIND_PATH (SZIP_INCLUDE_DIR
-    NAMES szlib.h
-    PATHS ${SZIP_INCLUDE_SEARCH_DIRS}
-    NO_DEFAULT_PATH
-)
-
-if (WIN32)
-    set (SZIP_SEARCH_DEBUG_NAMES "sz_d;libsz_d")
-    set (SZIP_SEARCH_RELEASE_NAMES "sz;libsz;libszip")
-else ()
-    set (SZIP_SEARCH_DEBUG_NAMES "sz_d")
-    set (SZIP_SEARCH_RELEASE_NAMES "sz;szip")
-endif ()
+# message (STATUS "Finding SZIP library and headers..." )
+#########################################################################
 
-# Look for the library.
-FIND_LIBRARY (SZIP_LIBRARY_DEBUG
-    NAMES ${SZIP_SEARCH_DEBUG_NAMES}
-    PATHS ${SZIP_LIB_SEARCH_DIRS}
-    NO_DEFAULT_PATH
-)
-
-FIND_LIBRARY (SZIP_LIBRARY_RELEASE
-    NAMES ${SZIP_SEARCH_RELEASE_NAMES}
-    PATHS ${SZIP_LIB_SEARCH_DIRS}
-    NO_DEFAULT_PATH
-)
-
-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)
-    get_filename_component (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_DEBUG} PATH)
-    set (SZIP_LIB_DIR  ${SZIP_LIBRARY_PATH})
-  elseif ()
-    get_filename_component (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_RELEASE} PATH)
-    set (SZIP_LIB_DIR  ${SZIP_LIBRARY_PATH})
-  endif ()
-else ()
-  set (SZIP_FOUND 0)
-  set (SZIP_LIBRARIES)
-  set (SZIP_INCLUDE_DIRS)
-endif ()
+
+find_path(SZIP_INCLUDE_DIR szlib.h)
+
+set(szip_names ${SZIP_NAMES} sz szip szip-static libsz libszip libszip-static)
+foreach(name ${szip_names})
+  list(APPEND szip_names_debug "${name}d")
+endforeach()
+
+if(NOT SZIP_LIBRARY)
+  find_library(SZIP_LIBRARY_RELEASE NAMES ${szip_names})
+  find_library(SZIP_LIBRARY_DEBUG NAMES ${szip_names_debug})
+  include(SelectLibraryConfigurations)
+  select_library_configurations(SZIP)
+  mark_as_advanced(SZIP_LIBRARY_RELEASE SZIP_LIBRARY_DEBUG)
+endif()
+unset(szip_names)
+unset(szip_names_debug)
+
+if(SZIP_INCLUDE_DIR AND EXISTS "${SZIP_INCLUDE_DIR}/SZconfig.h")
+    file(STRINGS "${SZIP_INCLUDE_DIR}/SZconfig.h" szip_version_str
+         REGEX "^#define[\t ]+SZIP_PACKAGE_VERSION[\t ]+.*")
+
+    string(REGEX REPLACE "^#define[\t ]+SZIP_PACKAGE_VERSION[\t ]+([0-9]+).*"
+           "\\1" SZIP_VERSION "${szip_version_str}")
+    unset(szip_version_str)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SZIP
+  REQUIRED_VARS SZIP_LIBRARY SZIP_INCLUDE_DIR
+  VERSION_VAR SZIP_VERSION)
+
+if(SZIP_FOUND)
+  set(SZIP_LIBRARIES ${SZIP_LIBRARY})
+  set(SZIP_INCLUDE_DIRS "${SZIP_INCLUDE_DIR}")
+
+  if(NOT TARGET SZIP::SZIP)
+    add_library(SZIP::SZIP UNKNOWN IMPORTED)
+    if(SZIP_INCLUDE_DIRS)
+      set_target_properties(SZIP::SZIP PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIRS}")
+    endif()
+    if(EXISTS "${SZIP_LIBRARY}")
+      set_target_properties(SZIP::SZIP PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${SZIP_LIBRARY}")
+    endif()
+    if(EXISTS "${SZIP_LIBRARY_RELEASE}")
+      set_property(TARGET SZIP::SZIP APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS RELEASE)
+      set_target_properties(SZIP::SZIP PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+        IMPORTED_LOCATION_RELEASE "${SZIP_LIBRARY_RELEASE}")
+    endif()
+    if(EXISTS "${SZIP_LIBRARY_DEBUG}")
+      set_property(TARGET SZIP::SZIP APPEND PROPERTY
+        IMPORTED_CONFIGURATIONS DEBUG)
+      set_target_properties(SZIP::SZIP PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+        IMPORTED_LOCATION_DEBUG "${SZIP_LIBRARY_DEBUG}")
+    endif()
+  endif()
+endif()
+
+mark_as_advanced(SZIP_LIBRARY SZIP_INCLUDE_DIR)
 
 # Report the results.
 if (NOT SZIP_FOUND)
@@ -153,29 +125,3 @@ if (NOT SZIP_FOUND)
     endif ()
   endif ()
 endif ()
-
-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})
-  # Add SZIP_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
-  set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${SZIP_INCLUDE_DIRS}")
-
-  # 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})
-  #
-  #############################################
-endif ()
-
-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 "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-endif ()
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 2f4ce52..e320c07 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -28,7 +28,7 @@ macro (SET_HDF_BUILD_TYPE)
     endif()
   endif()
   if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
+    message (STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
     set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
     # Set the possible values of build type for cmake-gui
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
@@ -73,12 +73,12 @@ endmacro ()
 
 #-------------------------------------------------------------------------------
 macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
-  if (WIN32 AND MSVC)
+  if (WIN32 AND MSVC AND NOT DISABLE_PDB_FILES)
     get_target_property (target_type ${libtarget} TYPE)
     if (${libtype} MATCHES "SHARED")
       set (targetfilename $<TARGET_PDB_FILE:${libtarget}>)
     else ()
-      get_property (target_name TARGET ${libtarget} PROPERTY OUTPUT_NAME_RELWITHDEBINFO)
+      get_property (target_name TARGET ${libtarget} PROPERTY $<IF:$<CONFIG:Debug>,OUTPUT_NAME_DEBUG,OUTPUT_NAME_RELWITHDEBINFO>)
       set (targetfilename $<TARGET_FILE_DIR:${libtarget}>/${target_name}.pdb)
     endif ()
     install (
@@ -86,9 +86,10 @@ macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
           ${targetfilename}
       DESTINATION
           ${targetdestination}
-      CONFIGURATIONS RelWithDebInfo
+      CONFIGURATIONS Debug RelWithDebInfo
       COMPONENT ${targetcomponent}
-  )
+      OPTIONAL
+    )
   endif ()
 endmacro ()
 
@@ -100,29 +101,25 @@ macro (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent)
           $<TARGET_PDB_FILE:${progtarget}>
       DESTINATION
           ${targetdestination}
-      CONFIGURATIONS RelWithDebInfo
+      CONFIGURATIONS Debug RelWithDebInfo
       COMPONENT ${targetcomponent}
-  )
+      OPTIONAL
+    )
   endif ()
 endmacro ()
 
 #-------------------------------------------------------------------------------
 macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
-  if (WIN32)
-    set (LIB_DEBUG_SUFFIX "_D")
-  else ()
-    set (LIB_DEBUG_SUFFIX "_debug")
-  endif ()
   if (${libtype} MATCHES "SHARED")
     set (LIB_RELEASE_NAME "${libname}")
-    set (LIB_DEBUG_NAME "${libname}${LIB_DEBUG_SUFFIX}")
+    set (LIB_DEBUG_NAME "${libname}${CMAKE_DEBUG_POSTFIX}")
   else ()
-    if (WIN32)
+    if (WIN32 AND NOT MINGW)
       set (LIB_RELEASE_NAME "lib${libname}")
-      set (LIB_DEBUG_NAME "lib${libname}${LIB_DEBUG_SUFFIX}")
+      set (LIB_DEBUG_NAME "lib${libname}${CMAKE_DEBUG_POSTFIX}")
     else ()
       set (LIB_RELEASE_NAME "${libname}")
-      set (LIB_DEBUG_NAME "${libname}${LIB_DEBUG_SUFFIX}")
+      set (LIB_DEBUG_NAME "${libname}${CMAKE_DEBUG_POSTFIX}")
     endif ()
   endif ()
 
@@ -130,8 +127,8 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
       PROPERTIES
          OUTPUT_NAME
                ${LIB_RELEASE_NAME}
-         OUTPUT_NAME_DEBUG
-               ${LIB_DEBUG_NAME}
+#         OUTPUT_NAME_DEBUG
+#               ${LIB_DEBUG_NAME}
          OUTPUT_NAME_RELEASE
                ${LIB_RELEASE_NAME}
          OUTPUT_NAME_MINSIZEREL
@@ -139,6 +136,11 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
          OUTPUT_NAME_RELWITHDEBINFO
                ${LIB_RELEASE_NAME}
   )
+  #get_property (target_name TARGET ${libtarget} PROPERTY OUTPUT_NAME)
+  #get_property (target_name_debug TARGET ${libtarget} PROPERTY OUTPUT_NAME_DEBUG)
+  #get_property (target_name_rwdi TARGET ${libtarget} PROPERTY OUTPUT_NAME_RELWITHDEBINFO)
+  #message (STATUS "${target_name} : ${target_name_debug} : ${target_name_rwdi}")
+
   if (${libtype} MATCHES "STATIC")
     if (WIN32)
       set_target_properties (${libtarget}
@@ -190,7 +192,12 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
         )
       endif ()
     else ()
-      if (CYGWIN)
+      if (MINGW)
+        set_target_properties (${libtarget} PROPERTIES
+            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib"
+            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        )
+      elseif (CYGWIN)
         set_target_properties (${libtarget} PROPERTIES
             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
@@ -224,10 +231,9 @@ macro (TARGET_C_PROPERTIES wintarget libtype)
       $<$<C_COMPILER_ID:MSVC>:${WIN_COMPILE_FLAGS}>
       $<$<CXX_COMPILER_ID:MSVC>:${WIN_COMPILE_FLAGS}>
   )
-  target_link_libraries(${wintarget} INTERFACE
-      $<$<C_COMPILER_ID:MSVC>:${WIN_LINK_FLAGS}>
-      $<$<CXX_COMPILER_ID:MSVC>:${WIN_LINK_FLAGS}>
-  )
+  if(MSVC)
+    set_property(TARGET ${wintarget} APPEND PROPERTY LINK_FLAGS "${WIN_LINK_FLAGS}")
+  endif()
 endmacro ()
 
 #-----------------------------------------------------------------------------
@@ -294,7 +300,9 @@ macro (HDF_README_PROPERTIES target_fortran)
     set (BINARY_PLATFORM "${BINARY_PLATFORM} / ${CMAKE_Fortran_COMPILER_ID} Fortran")
   endif ()
 
-  if (BUILD_SHARED_LIBS)
+  if (ONLY_SHARED_LIBS)
+    set (LIB_TYPE "Shared")
+  elseif (BUILD_SHARED_LIBS)
     set (LIB_TYPE "Static and Shared")
   else ()
     set (LIB_TYPE "Static")
@@ -377,6 +385,15 @@ macro (HDF_DIR_PATHS package_prefix)
     set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH})
   endif ()
 
+  #set the default debug suffix for all library targets
+    if(NOT CMAKE_DEBUG_POSTFIX)
+      if (WIN32)
+        set (CMAKE_DEBUG_POSTFIX "_D")
+      else ()
+        set (CMAKE_DEBUG_POSTFIX "_debug")
+      endif ()
+  endif ()
+
   SET_HDF_BUILD_TYPE()
 
 #-----------------------------------------------------------------------------
diff --git a/config/cmake_ext_mod/HDFUseFortran.cmake b/config/cmake_ext_mod/HDFUseFortran.cmake
index de66e33..bfb45fa 100644
--- a/config/cmake_ext_mod/HDFUseFortran.cmake
+++ b/config/cmake_ext_mod/HDFUseFortran.cmake
@@ -13,7 +13,7 @@
 # This file provides functions for Fortran support.
 #
 #-------------------------------------------------------------------------------
-ENABLE_LANGUAGE (Fortran)
+enable_language (Fortran)
 set (HDF_PREFIX "H5")
 
 #-------------------------------------------------------------------------------
@@ -191,7 +191,7 @@ CHECK_FORTRAN_FEATURE(iso_c_binding
 # Add debug information (intel Fortran : JB)
 #-----------------------------------------------------------------------------
 if (CMAKE_Fortran_COMPILER MATCHES ifort)
-    if (WIN32)
+    if (WIN32 AND NOT MINGW)
         set (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE)
         set (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE)
     endif ()
diff --git a/config/cmake_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake
index fe8af03..ab00e70 100644
--- a/config/cmake_ext_mod/grepTest.cmake
+++ b/config/cmake_ext_mod/grepTest.cmake
@@ -29,17 +29,38 @@ endif ()
 #  message (STATUS "Require TEST_EXPECT to be defined")
 #endif ()
 if (NOT TEST_FILTER)
-  message (STATUS "Require TEST_FILTER to be defined")
+  message (STATUS "Optional TEST_FILTER to be defined")
 endif ()
 if (NOT TEST_REFERENCE)
   message (FATAL_ERROR "Require TEST_REFERENCE to be defined")
 endif ()
 
-message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+endif ()
+
+if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+endif ()
+
+message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
+
+if (TEST_LIBRARY_DIRECTORY)
+  if (WIN32 OR MINGW)
+    set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
+  else ()
+    set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
+  endif ()
+endif ()
+
+if (TEST_ENV_VAR)
+  set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
+  #message (STATUS "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
+endif ()
 
 # run the test program, capture the stdout/stderr and the result var
 execute_process (
-    COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
+    COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
     WORKING_DIRECTORY ${TEST_FOLDER}
     RESULT_VARIABLE TEST_RESULT
     OUTPUT_FILE ${TEST_OUTPUT}
@@ -49,24 +70,116 @@ execute_process (
 )
 
 message (STATUS "COMMAND Result: ${TEST_RESULT}")
+
 message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
-# now grep the output with the reference
+# remove special output
 file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+string (FIND TEST_STREAM "_pmi_alps" "${TEST_FIND_RESULT}")
+if (TEST_FIND_RESULT GREATER 0)
+  string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM})
+endif ()
 
-# 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 (NOT TEST_RESULT)
-  message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+# if the TEST_ERRREF exists grep the error output with the error reference
+if (TEST_ERRREF)
+  # if the .err file exists grep the error output with the error reference before comparing stdout
+  if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_ERR_STREAM)
+
+    # TEST_ERRREF should always be matched
+    string (REGEX MATCH "${TEST_ERRREF}" TEST_MATCH ${TEST_ERR_STREAM})
+    string (COMPARE EQUAL "${TEST_ERRREF}" "${TEST_MATCH}" TEST_RESULT)
+    if (NOT TEST_RESULT)
+      message (FATAL_ERROR "Failed: The error output of ${TEST_PROGRAM} did not contain ${TEST_ERRREF}")
+    endif ()
+  endif ()
+
+  #always compare output file to reference unless this must be skipped
+  if (NOT TEST_SKIP_COMPARE)
+    if (EXISTS ${TEST_FOLDER}/${TEST_REFERENCE})
+      if (WIN32 OR MINGW)
+        configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+        file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+        #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+        #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+      endif ()
+      if (NOT TEST_SORT_COMPARE)
+        # 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
+        )
+      else ()
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
+        list (SORT v1)
+        list (SORT v2)
+        if (NOT v1 STREQUAL v2)
+          set(TEST_RESULT 1)
+        endif ()
+      endif ()
+
+      if (TEST_RESULT)
+        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)
+        list (LENGTH test_ref len_ref)
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          math (EXPR _FP_LEN "${len_ref} - 1")
+          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 (str_act)
+                set (TEST_RESULT 1)
+                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+              endif ()
+            endif ()
+          endforeach ()
+        else ()
+          if (len_act EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
+          endif ()
+          if (len_ref EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
+          endif ()
+        endif ()
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_RESULT 1)
+        endif ()
+      endif ()
+
+      message (STATUS "COMPARE Result: ${TEST_RESULT}")
+
+      # again, if return value is !=0 scream and shout
+      if (TEST_RESULT)
+        message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
+      endif ()
+    endif ()
+  endif ()
+else ()
+  # else grep the output with the reference
+  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 (NOT TEST_RESULT)
+    message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+  endif ()
 endif ()
 
-string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
-if (TEST_EXPECT)
-  # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
-  string (LENGTH "${TEST_MATCH}" TEST_RESULT)
-  if (TEST_RESULT)
-    message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+
+if (TEST_FILTER)
+  string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
+  if (TEST_EXPECT)
+    # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
+    string (LENGTH "${TEST_MATCH}" TEST_RESULT)
+    if (TEST_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+    endif ()
   endif ()
 endif ()
 
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index c9508f3..a904855 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -35,10 +35,10 @@ if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
   file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
 endif ()
 
-message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}")
 
 if (TEST_LIBRARY_DIRECTORY)
-  if (WIN32 AND NOT MINGW)
+  if (WIN32 OR MINGW)
     set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
   else ()
     set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@@ -53,7 +53,7 @@ endif ()
 if (NOT TEST_INPUT)
   # run the test program, capture the stdout/stderr and the result var
   execute_process (
-      COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
+      COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
       WORKING_DIRECTORY ${TEST_FOLDER}
       RESULT_VARIABLE TEST_RESULT
       OUTPUT_FILE ${TEST_OUTPUT}
@@ -64,7 +64,7 @@ if (NOT TEST_INPUT)
 else ()
   # run the test program with stdin, capture the stdout/stderr and the result var
   execute_process (
-      COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
+      COMMAND ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}
       WORKING_DIRECTORY ${TEST_FOLDER}
       RESULT_VARIABLE TEST_RESULT
       INPUT_FILE ${TEST_INPUT}
@@ -186,9 +186,11 @@ endif ()
 # compare output files to references unless this must be skipped
 if (NOT TEST_SKIP_COMPARE)
   if (EXISTS ${TEST_FOLDER}/${TEST_REFERENCE})
-    if (WIN32 AND NOT MINGW)
-      file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-      file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+    if (WIN32 OR MINGW)
+      configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
+      file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+      #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+      #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
     endif ()
 
     if (NOT TEST_SORT_COMPARE)
@@ -248,9 +250,11 @@ if (NOT TEST_SKIP_COMPARE)
 
   # now compare the .err file with the error reference, if supplied
   if (TEST_ERRREF)
-    if (WIN32 AND NOT MINGW)
-      file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
-      file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
+    if (WIN32 OR MINGW)
+      configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
+      file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+      #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
+      #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
     endif ()
 
     # now compare the error output with the error reference
diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake
new file mode 100644
index 0000000..721c39a
--- /dev/null
+++ b/config/toolchain/mingw64.cmake
@@ -0,0 +1,10 @@
+set (CMAKE_SYSTEM_NAME Windows)
+set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
+set (CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran)
+set (CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set (CMAKE_CROSSCOMPILING_EMULATOR wine64)