Correct binary dir var and reenable mingw

HDFGroup · Feb 2, 2024 · 9e41e58 · 9e41e58
1 parent c1bec76
commit 9e41e58
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -19,13 +19,13 @@ jobs:
             shared: "true"
             build_mode: "Release"
 
-#    call-release-netcdf-cmake-mingw:
-#        name: "CMake Release NetCDF MinGW Workflows"
-#        uses: ./.github/workflows/main-cmake-mingw.yml
-#        with:
-#            netcdf: "true"
-#            shared: "true"
-#            build_mode: "Release"
+    call-release-netcdf-cmake-mingw:
+        name: "CMake Release NetCDF MinGW Workflows"
+        uses: ./.github/workflows/main-cmake-mingw.yml
+        with:
+            netcdf: "true"
+            shared: "true"
+            build_mode: "Release"
 
     call-debug-netcdf-cmake:
         name: "CMake Debug NetCDF Workflows"

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
@@ -311,8 +311,8 @@ if (NOT HDF4_EXTERNALLY_CONFIGURED AND NOT HDF4_NO_PACKAGES)
       else ()
         set (WIX_CMP_NAME "${HDF4_SRC_LIB_NAME}")
       endif ()
-      configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF_BINARY_DIR}/patch.xml @ONLY)
-      set(CPACK_WIX_PATCH_FILE "${HDF_BINARY_DIR}/patch.xml")
+      configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF4_BINARY_DIR}/patch.xml @ONLY)
+      set(CPACK_WIX_PATCH_FILE "${HDF4_BINARY_DIR}/patch.xml")
     endif ()
   elseif (APPLE)
     list (APPEND CPACK_GENERATOR "STGZ")