diff --git a/.github/workflows/cygwin-cmake.yml b/.github/workflows/cygwin-cmake.yml
index 8c10a35552c..f28f985b69e 100644
--- a/.github/workflows/cygwin-cmake.yml
+++ b/.github/workflows/cygwin-cmake.yml
@@ -104,6 +104,8 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DPLUGIN_USE_LOCALCONTENT:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DENABLE_ZFP:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DENABLE_ZSTD:BOOL=OFF")
 
       - name: Run ctest (Cygwin)
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 3da5f0ecd5e..3598cacaa2a 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -180,7 +180,7 @@ if (NOT DEFINED HPC)
     if (DEFINED NINJA)
       set (CTEST_CMAKE_GENERATOR "Ninja")
     else ()
-      if (MINGW)
+      if (BUILD_GENERATOR STREQUAL "MINGW")
         set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
       else ()
         set (CTEST_CMAKE_GENERATOR "Unix Makefiles")