From c47e0ee07588bf623bd2b502086f50b9d843fd81 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 18 Sep 2024 16:49:36 -0500
Subject: [PATCH 01/35] Add a workflow to report to CDash

---
 .github/workflows/cmake-script.yml | 438 +++++++++++++++++++++++++++++
 .github/workflows/daily-build.yml  |  21 +-
 2 files changed, 456 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/cmake-script.yml

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
new file mode 100644
index 00000000000..e3c20edb2f3
--- /dev/null
+++ b/.github/workflows/cmake-script.yml
@@ -0,0 +1,438 @@
+name: hdf5 dev ctest script runs
+
+# Triggers the workflow on a call from another workflow
+on:
+  workflow_call:
+    inputs:
+      snap_name:
+        description: 'The name in the source tarballs'
+        type: string
+        required: false
+        default: hdfsrc
+      file_base:
+        description: "The common base name of the source tarballs"
+        required: true
+        type: string
+      use_environ:
+        description: 'Environment to locate files'
+        type: string
+        required: true
+        default: snapshots
+
+permissions:
+  contents: read
+
+jobs:
+  build_and_test_win:
+  # Windows w/ MSVC + CMake
+  #
+    name: "Windows MSVC CTest"
+    runs-on: windows-latest
+    steps:
+      - name: Install Dependencies (Windows)
+        run: choco install ninja
+
+      - name: Install Dependencies
+        uses: ssciwr/doxygen-install@v1
+        with:
+          version: "1.9.7"
+
+      - name: Enable Developer Command Prompt
+        uses: ilammy/msvc-dev-cmd@v1.13.0
+
+      - name: Set file base name (Windows)
+        id: set-file-base
+        run: |
+          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
+          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
+          if [[ '${{ inputs.use_environ }}' == 'release' ]]
+          then
+            SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}")
+          else
+            SOURCE_NAME_BASE=$(echo "hdfsrc")
+          fi
+          echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT
+        shell: bash
+
+      # Get files created by release script
+      - name: Get zip-tarball (Windows)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+              name: zip-tarball
+              path: ${{ github.workspace }}
+
+      - name: using powershell
+        shell: pwsh
+        run: Get-Location
+
+      - name: List files for the space (Windows)
+        run: |
+              Get-ChildItem -Path ${{ github.workspace }}
+              Get-ChildItem -Path ${{ runner.workspace }}
+        shell: pwsh
+
+      - name: Uncompress source (Windows)
+        working-directory: ${{ github.workspace }}
+        run: 7z x ${{ steps.set-file-base.outputs.FILE_BASE }}.zip
+        shell: bash
+
+      - name: Copy script files for the space (Windows)
+        run: |
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* -Destination ${{ runner.workspace }}/hdf5/
+        shell: pwsh
+
+      - name: Run ctest script (Windows)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264 -C Release -VV -O hdf5.log
+          cmake --workflow --preset=${{ inputs.preset_name }}-MSVC --fresh
+        shell: bash
+
+      # Save log files created by ctest script
+      - name: Save log (Windows_intel)
+        uses: actions/upload-artifact@v4
+        with:
+          name: intel-win-log
+          path: ${{ runner.workspace }}/hdf5/hdf5.log
+          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+
+  build_and_test_linux:
+  # Linux (Ubuntu) w/ gcc + CMake
+  #
+    name: "Ubuntu gcc CMake"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install CMake Dependencies (Linux)
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build graphviz
+
+      - name: Install Dependencies
+        uses: ssciwr/doxygen-install@v1
+        with:
+          version: "1.9.7"
+
+      - name: Set file base name (Linux)
+        id: set-file-base
+        run: |
+          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
+          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
+          if [[ '${{ inputs.use_environ }}' == 'release' ]]
+          then
+            SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}")
+          else
+            SOURCE_NAME_BASE=$(echo "hdfsrc")
+          fi
+          echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT
+
+      # Get files created by release script
+      - name: Get tgz-tarball (Linux)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+              name: tgz-tarball
+              path: ${{ github.workspace }}
+
+      - name: List files for the space (Linux)
+        run: |
+              ls -l ${{ github.workspace }}
+              ls ${{ runner.workspace }}
+
+      - name: Uncompress source (Linux)
+        run: tar -zxvf ${{ github.workspace }}/${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz
+
+      - name: Copy script files for the space (Linux)
+        run: |
+            cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
+
+      - name: Run ctest (Linux)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+        shell: bash
+
+      # Save log files created by ctest script
+      - name: Save log (Linux)
+        uses: actions/upload-artifact@v4
+        with:
+            name: gcc-ubuntu-log
+            path: ${{ runner.workspace }}/hdf5/hdf5.log
+            if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+
+  build_and_test_mac_latest:
+  # MacOS w/ Clang + CMake
+  #
+    name: "MacOS Clang CMake"
+    runs-on: macos-latest
+    steps:
+      - name: Install Dependencies (MacOS_latest)
+        run: brew install ninja
+
+      - name: Install Dependencies
+        uses: ssciwr/doxygen-install@v1
+        with:
+          version: "1.9.7"
+
+      - name: Set up JDK 19
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Set file base name (MacOS_latest)
+        id: set-file-base
+        run: |
+          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
+          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
+          if [[ '${{ inputs.use_environ }}' == 'release' ]]
+          then
+            SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}")
+          else
+            SOURCE_NAME_BASE=$(echo "hdfsrc")
+          fi
+          echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT
+
+      # Get files created by release script
+      - name: Get tgz-tarball (MacOS_latest)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+              name: tgz-tarball
+              path: ${{ github.workspace }}
+
+      - name: List files for the space (MacOS_latest)
+        run: |
+              ls ${{ github.workspace }}
+              ls ${{ runner.workspace }}
+
+      - name: Uncompress source (MacOS_latest)
+        run: tar -zxvf ${{ github.workspace }}/${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz
+
+      - name: Copy script files for the space (MacOS_latest)
+        run: |
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
+
+      # symlinks the compiler executables to a common location 
+      - name: Setup GNU Fortran
+        uses: fortran-lang/setup-fortran@v1
+        id: setup-fortran
+        with:
+          compiler: gcc
+          version: 14
+
+      - name: Run ctest (MacOS_latest)
+        id: run-ctest
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+        shell: bash
+
+      # Save log files created by ctest script
+      - name: Save log (MacOS_latest)
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-log
+          path: ${{ runner.workspace }}/hdf5/hdf5.log
+          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+
+  build_and_test_S3_linux:
+  # Linux S3 (Ubuntu) w/ gcc + CMake
+  #
+    name: "Ubuntu gcc CMake S3"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install CMake Dependencies (Linux S3)
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build doxygen graphviz
+          sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
+
+      - name: Set file base name (Linux S3)
+        id: set-file-base
+        run: |
+          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
+          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
+          if [[ '${{ inputs.use_environ }}' == 'release' ]]
+          then
+            SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}")
+          else
+            SOURCE_NAME_BASE=$(echo "hdfsrc")
+          fi
+          echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT
+
+      # Get files created by release script
+      - name: Get tgz-tarball (Linux S3)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+              name: tgz-tarball
+              path: ${{ github.workspace }}
+
+      - name: List files for the space (Linux S3)
+        run: |
+              ls -l ${{ github.workspace }}
+              ls ${{ runner.workspace }}
+
+      - name: Uncompress source (Linux S3)
+        run: tar -zxvf ${{ github.workspace }}/${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz
+
+      - name: Copy script files for the space (Linux S3)
+        run: |
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
+
+      - name: Run ctest (Linux S3)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+        shell: bash
+
+      # Save log files created by ctest script
+      - name: Save log (Linux S3)
+        uses: actions/upload-artifact@v4
+        with:
+          name: s3-ubuntu-log
+          path: ${{ runner.workspace }}/hdf5/hdf5.log
+          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+
+####### intel builds
+  build_and_test_win_intel:
+  # Windows w/ OneAPI + CMake
+  #
+    name: "Windows Intel CTest"
+    runs-on: windows-latest
+    steps:
+      - name: Install Dependencies (Windows_intel)
+        run: choco install ninja
+
+      - name: add oneAPI to env
+        uses: fortran-lang/setup-fortran@v1
+        id: setup-fortran
+        with:
+          compiler: intel
+          version: '2024.1'
+
+      - name: Set file base name (Windows_intel)
+        id: set-file-base
+        run: |
+          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
+          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
+          if [[ '${{ inputs.use_environ }}' == 'release' ]]
+          then
+            SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}")
+          else
+            SOURCE_NAME_BASE=$(echo "hdfsrc")
+          fi
+          echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT
+        shell: bash
+
+      # Get files created by release script
+      - name: Get zip-tarball (Windows_intel)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+              name: zip-tarball
+              path: ${{ github.workspace }}
+
+      - name: using powershell
+        shell: pwsh
+        run: Get-Location
+
+      - name: List files for the space (Windows_intel)
+        run: |
+              Get-ChildItem -Path ${{ github.workspace }}
+              Get-ChildItem -Path ${{ runner.workspace }}
+        shell: pwsh
+
+      - name: Uncompress source (Windows_intel)
+        working-directory: ${{ github.workspace }}
+        run: 7z x ${{ steps.set-file-base.outputs.FILE_BASE }}.zip
+        shell: bash
+
+      - name: Copy script files for the space (Windows_intel)
+        run: |
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* -Destination ${{ runner.workspace }}/hdf5/
+        shell: pwsh
+
+      - name: Run ctest (Windows_intel) with oneapi
+        env:
+          FC: ${{ steps.setup-fortran.outputs.fc }}
+          CC: ${{ steps.setup-fortran.outputs.cc }}
+          CXX: ${{ steps.setup-fortran.outputs.cxx }}
+          BINSIGN: ${{ needs.check-secret.outputs.sign-state }}
+          SIGNTOOLDIR: ${{ github.workspace }}/Microsoft.Windows.SDK.BuildTools/bin/10.0.22621.0/x64
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264 -C Release -VV -O hdf5.log
+        shell: pwsh
+
+      # Save log files created by ctest script
+      - name: Save log (Windows_intel)
+        uses: actions/upload-artifact@v4
+        with:
+          name: intel-win-log
+          path: ${{ runner.workspace }}/hdf5/hdf5.log
+          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+
+  build_and_test_linux_intel:
+  # Linux (Ubuntu) w/ OneAPI + CMake
+  #
+    name: "Ubuntu Intel CMake"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install CMake Dependencies (Linux_intel)
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build doxygen graphviz
+
+      - name: add oneAPI to env
+        uses: fortran-lang/setup-fortran@v1
+        id: setup-fortran
+        with:
+          compiler: intel
+          version: '2024.1'
+
+      - name: Set file base name (Linux_intel)
+        id: set-file-base
+        run: |
+          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
+          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
+          if [[ '${{ inputs.use_environ }}' == 'release' ]]
+          then
+            SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}")
+          else
+            SOURCE_NAME_BASE=$(echo "hdfsrc")
+          fi
+          echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT
+
+      # Get files created by release script
+      - name: Get tgz-tarball (Linux_intel)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+              name: tgz-tarball
+              path: ${{ github.workspace }}
+
+      - name: List files for the space (Linux_intel)
+        run: |
+              ls -l ${{ github.workspace }}
+              ls ${{ runner.workspace }}
+
+      - name: Uncompress source (Linux_intel)
+        run: tar -zxvf ${{ github.workspace }}/${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz
+
+      - name: Copy script files for the space (Linux_intel)
+        run: |
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
+
+      - name: Run ctest (Linux_intel)
+        env:
+          FC: ${{ steps.setup-fortran.outputs.fc }}
+          CC: ${{ steps.setup-fortran.outputs.cc }}
+          CXX: ${{ steps.setup-fortran.outputs.cxx }}
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+        shell: bash
+
+      # Save log files created by ctest script
+      - name: Save log (Linux_intel)
+        uses: actions/upload-artifact@v4
+        with:
+          name: intel-ubuntu-log
+          path: ${{ runner.workspace }}/hdf5/hdf5.log
+          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index 2b7d6aef3bf..67fce539128 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -3,6 +3,12 @@ name: hdf5 dev daily build
 # Triggers the workflow on a schedule or on demand
 on:
   workflow_dispatch:
+    inputs:
+      use_ignore:
+        description: 'Ignore has changes check'
+        type: string
+        required: false
+        default: check
   schedule:
     - cron: "6 0 * * *"
 
@@ -14,6 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       hdf5-name: ${{ steps.gethdf5base.outputs.HDF5_NAME_BASE }}
+      run-ignore: ${{ steps.getinputs.outputs.INPUTS_IGNORE }}
 
     steps:
     - uses: actions/checkout@v4.1.7
@@ -36,6 +43,14 @@ jobs:
       use_tag: snapshot
       use_environ: snapshots
 
+  call-workflow-c-script:
+    needs: call-workflow-tarball
+    uses: ./.github/workflows/cmake-script.yml
+    with:
+      file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
+      use_environ: snapshots
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
+
   call-workflow-ctest:
     needs: call-workflow-tarball
     uses: ./.github/workflows/cmake-ctest.yml
@@ -54,7 +69,7 @@ jobs:
         AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
         AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
         AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
-    if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
+      if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-abi:
     needs: [call-workflow-tarball, call-workflow-ctest]
@@ -64,7 +79,7 @@ jobs:
       file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
       use_tag: snapshot
       use_environ: snapshots
-    if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-release:
     needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi]
@@ -77,7 +92,7 @@ jobs:
       file_sha: ${{ needs.call-workflow-tarball.outputs.file_sha }}
       use_tag: snapshot
       use_environ: snapshots
-    if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-remove:
     needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi, call-workflow-release]

From 16085c7e0e1633229d74f1ddc955b76181b5889e Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 18 Sep 2024 16:53:07 -0500
Subject: [PATCH 02/35] Correct syntax

---
 .github/workflows/daily-build.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index 67fce539128..8abf13ef7af 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -38,13 +38,14 @@ jobs:
     - run: echo "hdf5 base name is ${{ steps.gethdf5base.outputs.HDF5_NAME_BASE }}."
 
   call-workflow-tarball:
+    needs: [get-old-names]
     uses: ./.github/workflows/tarball.yml
     with:
       use_tag: snapshot
       use_environ: snapshots
 
   call-workflow-c-script:
-    needs: call-workflow-tarball
+    needs: [get-old-names, call-workflow-tarball]
     uses: ./.github/workflows/cmake-script.yml
     with:
       file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
@@ -52,7 +53,7 @@ jobs:
     if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-ctest:
-    needs: call-workflow-tarball
+    needs: [get-old-names, call-workflow-tarball]
     uses: ./.github/workflows/cmake-ctest.yml
     with:
       preset_name: ci-StdShar
@@ -72,7 +73,7 @@ jobs:
       if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-abi:
-    needs: [call-workflow-tarball, call-workflow-ctest]
+    needs: [get-old-names, call-workflow-tarball, call-workflow-ctest]
     uses: ./.github/workflows/abi-report.yml
     with:
       file_ref: '1.14.4.3'

From 5b98de3eda5388229a723d01443ceec672c369d0 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 18 Sep 2024 16:54:54 -0500
Subject: [PATCH 03/35] Correct indent

---
 .github/workflows/daily-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index 8abf13ef7af..ef4bd1ed025 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -70,7 +70,7 @@ jobs:
         AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
         AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
         AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
-      if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-abi:
     needs: [get-old-names, call-workflow-tarball, call-workflow-ctest]

From 3962f88b937e8186ee3c99897a0d687e3f795b38 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 08:26:44 -0500
Subject: [PATCH 04/35] Set source dir as argument

---
 .github/workflows/cmake-script.yml | 39 ++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index e3c20edb2f3..cc228a80d06 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -81,11 +81,15 @@ jobs:
           Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* -Destination ${{ runner.workspace }}/hdf5/
         shell: pwsh
 
+      - name: List files for the hdf5 (Windows)
+        run: |
+          Get-ChildItem -Path ${{ runner.workspace }}/hdf5
+        shell: pwsh
+
       - name: Run ctest script (Windows)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264 -C Release -VV -O hdf5.log
-          cmake --workflow --preset=${{ inputs.preset_name }}-MSVC --fresh
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script
@@ -144,10 +148,14 @@ jobs:
         run: |
             cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
 
+      - name: List files for the hdf5 (Linux)
+        run: |
+            ls ${{ runner.workspace }}/hdf5
+
       - name: Run ctest (Linux)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script
@@ -218,11 +226,15 @@ jobs:
           compiler: gcc
           version: 14
 
+      - name: List files for the hdf5 (MacOS_latest)
+        run: |
+              ls ${{ runner.workspace }}/hdf5
+
       - name: Run ctest (MacOS_latest)
         id: run-ctest
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script
@@ -277,10 +289,14 @@ jobs:
         run: |
           cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
 
+      - name: List files for the hdf5 (Linux S3)
+        run: |
+              ls ${{ runner.workspace }}/hdf5
+
       - name: Run ctest (Linux S3)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script
@@ -349,6 +365,11 @@ jobs:
           Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* -Destination ${{ runner.workspace }}/hdf5/
         shell: pwsh
 
+      - name: List files for the hdf5 (Windows_intel)
+        run: |
+              Get-ChildItem -Path ${{ runner.workspace }}/hdf5
+        shell: pwsh
+
       - name: Run ctest (Windows_intel) with oneapi
         env:
           FC: ${{ steps.setup-fortran.outputs.fc }}
@@ -358,7 +379,7 @@ jobs:
           SIGNTOOLDIR: ${{ github.workspace }}/Microsoft.Windows.SDK.BuildTools/bin/10.0.22621.0/x64
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264 -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: pwsh
 
       # Save log files created by ctest script
@@ -419,6 +440,10 @@ jobs:
         run: |
           cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
 
+      - name: List files for the hdf5 (Linux_intel)
+        run: |
+              ls ${{ runner.workspace }}/hdf5
+
       - name: Run ctest (Linux_intel)
         env:
           FC: ${{ steps.setup-fortran.outputs.fc }}
@@ -426,7 +451,7 @@ jobs:
           CXX: ${{ steps.setup-fortran.outputs.cxx }}
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script

From 91977ab620b5147c36c2e36c5d9a31e9c59878e8 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 08:32:47 -0500
Subject: [PATCH 05/35] specify just the cmake files to be copied

---
 .github/workflows/cmake-script.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index cc228a80d06..9799916ee4c 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -78,7 +78,7 @@ jobs:
 
       - name: Copy script files for the space (Windows)
         run: |
-          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* -Destination ${{ runner.workspace }}/hdf5/
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake -Destination ${{ runner.workspace }}/hdf5/
         shell: pwsh
 
       - name: List files for the hdf5 (Windows)
@@ -146,7 +146,7 @@ jobs:
 
       - name: Copy script files for the space (Linux)
         run: |
-            cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
+            cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake ${{ runner.workspace }}/hdf5
 
       - name: List files for the hdf5 (Linux)
         run: |
@@ -216,7 +216,7 @@ jobs:
 
       - name: Copy script files for the space (MacOS_latest)
         run: |
-          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake ${{ runner.workspace }}/hdf5
 
       # symlinks the compiler executables to a common location 
       - name: Setup GNU Fortran
@@ -287,7 +287,7 @@ jobs:
 
       - name: Copy script files for the space (Linux S3)
         run: |
-          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake ${{ runner.workspace }}/hdf5
 
       - name: List files for the hdf5 (Linux S3)
         run: |
@@ -362,7 +362,7 @@ jobs:
 
       - name: Copy script files for the space (Windows_intel)
         run: |
-          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* -Destination ${{ runner.workspace }}/hdf5/
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake -Destination ${{ runner.workspace }}/hdf5/
         shell: pwsh
 
       - name: List files for the hdf5 (Windows_intel)
@@ -438,7 +438,7 @@ jobs:
 
       - name: Copy script files for the space (Linux_intel)
         run: |
-          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/* ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake ${{ runner.workspace }}/hdf5
 
       - name: List files for the hdf5 (Linux_intel)
         run: |

From 3687b27c67939237a7fdfe8c25d52e2610252ea2 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 09:05:22 -0500
Subject: [PATCH 06/35] Enable CDash submits

---
 .github/workflows/cmake-script.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 9799916ee4c..76d2b38d232 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -89,14 +89,14 @@ jobs:
       - name: Run ctest script (Windows)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script
       - name: Save log (Windows_intel)
         uses: actions/upload-artifact@v4
         with:
-          name: intel-win-log
+          name: cl-win-log
           path: ${{ runner.workspace }}/hdf5/hdf5.log
           if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
 
@@ -155,7 +155,7 @@ jobs:
       - name: Run ctest (Linux)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script
@@ -234,7 +234,7 @@ jobs:
         id: run-ctest
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script
@@ -296,7 +296,7 @@ jobs:
       - name: Run ctest (Linux S3)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script
@@ -379,7 +379,7 @@ jobs:
           SIGNTOOLDIR: ${{ github.workspace }}/Microsoft.Windows.SDK.BuildTools/bin/10.0.22621.0/x64
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: pwsh
 
       # Save log files created by ctest script
@@ -451,7 +451,7 @@ jobs:
           CXX: ${{ steps.setup-fortran.outputs.cxx }}
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
 
       # Save log files created by ctest script

From b4b635ba05f67ce72808644843b514911953602a Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 09:22:22 -0500
Subject: [PATCH 07/35] Ensure log file is uploaded

---
 .github/workflows/cmake-script.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 76d2b38d232..183c42c1d4b 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -91,6 +91,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
+        continue-on-error: true
 
       # Save log files created by ctest script
       - name: Save log (Windows_intel)
@@ -157,6 +158,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
+        continue-on-error: true
 
       # Save log files created by ctest script
       - name: Save log (Linux)
@@ -236,6 +238,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
+        continue-on-error: true
 
       # Save log files created by ctest script
       - name: Save log (MacOS_latest)
@@ -298,6 +301,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
+        continue-on-error: true
 
       # Save log files created by ctest script
       - name: Save log (Linux S3)
@@ -381,6 +385,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: pwsh
+        continue-on-error: true
 
       # Save log files created by ctest script
       - name: Save log (Windows_intel)
@@ -453,6 +458,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
+        continue-on-error: true
 
       # Save log files created by ctest script
       - name: Save log (Linux_intel)

From 2e602f0c30ef3880e9a7763817961661a036f751 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 13:20:20 -0500
Subject: [PATCH 08/35] Create custom options file for CDash reports

---
 .github/workflows/cmake-script.yml | 126 ++++++++++++++++++++++++++---
 1 file changed, 117 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 183c42c1d4b..71e96b92b10 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -78,7 +78,8 @@ jobs:
 
       - name: Copy script files for the space (Windows)
         run: |
-          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake -Destination ${{ runner.workspace }}/hdf5/
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake -Destination ${{ runner.workspace }}/hdf5/
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake -Destination ${{ runner.workspace }}/hdf5/
         shell: pwsh
 
       - name: List files for the hdf5 (Windows)
@@ -86,6 +87,23 @@ jobs:
           Get-ChildItem -Path ${{ runner.workspace }}/hdf5
         shell: pwsh
 
+      - name: Create options file (Windows)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          cat <<EOF > HDF5options.cmake
+          set (CTEST_DROP_SITE_INIT "my.cdash.org")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+          #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+          EOF
+
       - name: Run ctest script (Windows)
         run: |
           cd "${{ runner.workspace }}/hdf5"
@@ -139,20 +157,38 @@ jobs:
 
       - name: List files for the space (Linux)
         run: |
-              ls -l ${{ github.workspace }}
-              ls ${{ runner.workspace }}
+            ls -l ${{ github.workspace }}
+            ls ${{ runner.workspace }}
 
       - name: Uncompress source (Linux)
         run: tar -zxvf ${{ github.workspace }}/${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz
 
       - name: Copy script files for the space (Linux)
         run: |
-            cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake ${{ runner.workspace }}/hdf5
 
       - name: List files for the hdf5 (Linux)
         run: |
             ls ${{ runner.workspace }}/hdf5
 
+      - name: Create options file (Linux)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          cat <<EOF > HDF5options.cmake
+          set (CTEST_DROP_SITE_INIT "my.cdash.org")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+          EOF
+
       - name: Run ctest (Linux)
         run: |
           cd "${{ runner.workspace }}/hdf5"
@@ -218,7 +254,8 @@ jobs:
 
       - name: Copy script files for the space (MacOS_latest)
         run: |
-          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake ${{ runner.workspace }}/hdf5
 
       # symlinks the compiler executables to a common location 
       - name: Setup GNU Fortran
@@ -232,6 +269,23 @@ jobs:
         run: |
               ls ${{ runner.workspace }}/hdf5
 
+      - name: Create options file (MacOS_latest)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          cat <<EOF > HDF5options.cmake
+          set (CTEST_DROP_SITE_INIT "my.cdash.org")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+          EOF
+
       - name: Run ctest (MacOS_latest)
         id: run-ctest
         run: |
@@ -290,12 +344,30 @@ jobs:
 
       - name: Copy script files for the space (Linux S3)
         run: |
-          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake ${{ runner.workspace }}/hdf5
 
       - name: List files for the hdf5 (Linux S3)
         run: |
               ls ${{ runner.workspace }}/hdf5
 
+      - name: Create options file (Linux S3)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          cat <<EOF > HDF5options.cmake
+          set (CTEST_DROP_SITE_INIT "my.cdash.org")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+          EOF
+
       - name: Run ctest (Linux S3)
         run: |
           cd "${{ runner.workspace }}/hdf5"
@@ -366,7 +438,8 @@ jobs:
 
       - name: Copy script files for the space (Windows_intel)
         run: |
-          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake -Destination ${{ runner.workspace }}/hdf5/
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake -Destination ${{ runner.workspace }}/hdf5/
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake -Destination ${{ runner.workspace }}/hdf5/
         shell: pwsh
 
       - name: List files for the hdf5 (Windows_intel)
@@ -374,6 +447,23 @@ jobs:
               Get-ChildItem -Path ${{ runner.workspace }}/hdf5
         shell: pwsh
 
+      - name: Create options file (Windows_intel)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          cat <<EOF > HDF5options.cmake
+          set (CTEST_DROP_SITE_INIT "my.cdash.org")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+          EOF
+
       - name: Run ctest (Windows_intel) with oneapi
         env:
           FC: ${{ steps.setup-fortran.outputs.fc }}
@@ -443,11 +533,29 @@ jobs:
 
       - name: Copy script files for the space (Linux_intel)
         run: |
-          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/*.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake ${{ runner.workspace }}/hdf5
 
       - name: List files for the hdf5 (Linux_intel)
         run: |
-              ls ${{ runner.workspace }}/hdf5
+          ls ${{ runner.workspace }}/hdf5
+
+      - name: Create options file (Linux_intel)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          cat <<EOF > HDF5options.cmake
+          set (CTEST_DROP_SITE_INIT "my.cdash.org")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+          EOF
 
       - name: Run ctest (Linux_intel)
         env:

From d9ecd6b72258d88c9ad3fa8d7e24651af2e823e2 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 13:42:35 -0500
Subject: [PATCH 09/35] Fix cmake issues and correct paths

---
 .github/workflows/cmake-script.yml      | 14 ++++++++------
 config/cmake/examples/CTestScript.cmake |  4 ++--
 config/cmake/scripts/CTestScript.cmake  |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 71e96b92b10..82533f2fcc1 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -92,7 +92,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           cat <<EOF > HDF5options.cmake
           set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
           #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
@@ -103,6 +103,7 @@ jobs:
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
           EOF
+        shell: bash
 
       - name: Run ctest script (Windows)
         run: |
@@ -177,7 +178,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           cat <<EOF > HDF5options.cmake
           set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
@@ -274,7 +275,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           cat <<EOF > HDF5options.cmake
           set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
@@ -356,7 +357,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           cat <<EOF > HDF5options.cmake
           set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
@@ -452,7 +453,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           cat <<EOF > HDF5options.cmake
           set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
@@ -463,6 +464,7 @@ jobs:
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
           EOF
+        shell: bash
 
       - name: Run ctest (Windows_intel) with oneapi
         env:
@@ -545,7 +547,7 @@ jobs:
           cd "${{ runner.workspace }}/hdf5"
           cat <<EOF > HDF5options.cmake
           set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5114")
+          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
           set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
diff --git a/config/cmake/examples/CTestScript.cmake b/config/cmake/examples/CTestScript.cmake
index b1bfa8a9fc1..40f91fcbdf7 100644
--- a/config/cmake/examples/CTestScript.cmake
+++ b/config/cmake/examples/CTestScript.cmake
@@ -22,11 +22,11 @@ if (NOT SITE_OS_NAME)
   ## -- set hostname
   ## --------------------------
   find_program (HOSTNAME_CMD NAMES hostname)
-  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
+  execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME)
   set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
   find_program (UNAME NAMES uname)
   macro (getuname name flag)
-    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
+    execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}")
   endmacro ()
 
   getuname (osname -s)
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 46037f573b1..9e522f31795 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -23,11 +23,11 @@ if (NOT SITE_OS_NAME)
   ## -- set hostname
   ## --------------------------
   find_program (HOSTNAME_CMD NAMES hostname)
-  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
+  execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME)
   set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
   find_program (UNAME NAMES uname)
   macro (getuname name flag)
-    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
+    execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}")
   endmacro ()
 
   getuname (osname -s)

From 9528cdb97c4852097fb5fb6e344f7337ca742b4c Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 14:27:56 -0500
Subject: [PATCH 10/35] Change how to write options file

---
 .github/workflows/cmake-script.yml | 196 +++++++++++++++--------------
 1 file changed, 103 insertions(+), 93 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 82533f2fcc1..e6621c7acff 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -88,22 +88,23 @@ jobs:
         shell: pwsh
 
       - name: Create options file (Windows)
-        run: |
-          cd "${{ runner.workspace }}/hdf5"
-          cat <<EOF > HDF5options.cmake
-          set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-          #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
-          EOF
-        shell: bash
+        uses: "DamianReeves/write-file-action@master"
+        with:
+            path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
+            write-mode: overwrite
+            contents: |
+              set (CTEST_SITE_EXT "GH-Windows.VScl")
+              set (CTEST_DROP_SITE_INIT "my.cdash.org")
+              set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+              #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest script (Windows)
         run: |
@@ -174,21 +175,23 @@ jobs:
             ls ${{ runner.workspace }}/hdf5
 
       - name: Create options file (Linux)
-        run: |
-          cd "${{ runner.workspace }}/hdf5"
-          cat <<EOF > HDF5options.cmake
-          set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
-          EOF
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
+          write-mode: overwrite
+          contents: |
+            set (CTEST_SITE_EXT "GH-Linux.Gcc")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux)
         run: |
@@ -271,21 +274,23 @@ jobs:
               ls ${{ runner.workspace }}/hdf5
 
       - name: Create options file (MacOS_latest)
-        run: |
-          cd "${{ runner.workspace }}/hdf5"
-          cat <<EOF > HDF5options.cmake
-          set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
-          EOF
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
+          write-mode: overwrite
+          contents: |
+            set (CTEST_SITE_EXT "GH-Mac.Clang")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (MacOS_latest)
         id: run-ctest
@@ -353,21 +358,23 @@ jobs:
               ls ${{ runner.workspace }}/hdf5
 
       - name: Create options file (Linux S3)
-        run: |
-          cd "${{ runner.workspace }}/hdf5"
-          cat <<EOF > HDF5options.cmake
-          set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
-          EOF
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
+          write-mode: overwrite
+          contents: |
+            set (CTEST_SITE_EXT "GH-Linux.S3")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux S3)
         run: |
@@ -449,22 +456,23 @@ jobs:
         shell: pwsh
 
       - name: Create options file (Windows_intel)
-        run: |
-          cd "${{ runner.workspace }}/hdf5"
-          cat <<EOF > HDF5options.cmake
-          set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
-          EOF
-        shell: bash
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
+          write-mode: overwrite
+          contents: |
+            set (CTEST_SITE_EXT "GH-Windows.Intel")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Windows_intel) with oneapi
         env:
@@ -538,26 +546,28 @@ jobs:
           cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake ${{ runner.workspace }}/hdf5
           cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake ${{ runner.workspace }}/hdf5
 
-      - name: List files for the hdf5 (Linux_intel)
+      - name: List files for the hdf5 (Linux_Linux)
         run: |
           ls ${{ runner.workspace }}/hdf5
 
       - name: Create options file (Linux_intel)
-        run: |
-          cd "${{ runner.workspace }}/hdf5"
-          cat <<EOF > HDF5options.cmake
-          set (CTEST_DROP_SITE_INIT "my.cdash.org")
-          set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
-          set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
-          EOF
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
+          write-mode: overwrite
+          contents: |
+            set (CTEST_SITE_EXT "GH-Linux.Intel")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux_intel)
         env:

From 14235d54016ed8fedbad425fc5fc130533b21b71 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 16:24:38 -0500
Subject: [PATCH 11/35] Install curl dependicies on linux

---
 .github/workflows/cmake-script.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index e6621c7acff..3d584db7d54 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -130,7 +130,7 @@ jobs:
       - name: Install CMake Dependencies (Linux)
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build graphviz
+          sudo apt-get install ninja-build graphviz curl
 
       - name: Install Dependencies
         uses: ssciwr/doxygen-install@v1
@@ -215,7 +215,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Install Dependencies (MacOS_latest)
-        run: brew install ninja
+        run: brew install ninja curl
 
       - name: Install Dependencies
         uses: ssciwr/doxygen-install@v1
@@ -317,7 +317,7 @@ jobs:
       - name: Install CMake Dependencies (Linux S3)
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build doxygen graphviz
+          sudo apt-get install ninja-build doxygen graphviz curl
           sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
 
       - name: Set file base name (Linux S3)
@@ -464,6 +464,7 @@ jobs:
             set (CTEST_SITE_EXT "GH-Windows.Intel")
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
@@ -504,7 +505,7 @@ jobs:
       - name: Install CMake Dependencies (Linux_intel)
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build doxygen graphviz
+          sudo apt-get install ninja-build doxygen graphviz curl
 
       - name: add oneAPI to env
         uses: fortran-lang/setup-fortran@v1
@@ -559,6 +560,7 @@ jobs:
             set (CTEST_SITE_EXT "GH-Linux.Intel")
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")

From b01fc7a1ae554a3037847ddf0bec03a3518fd9a4 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 16:44:08 -0500
Subject: [PATCH 12/35] Remove HSDS option

---
 .github/workflows/cmake-script.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 3d584db7d54..76ace4a5bae 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -103,7 +103,6 @@ jobs:
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest script (Windows)
@@ -190,7 +189,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux)
@@ -289,7 +287,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (MacOS_latest)
@@ -373,7 +370,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux S3)
@@ -472,7 +468,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Windows_intel) with oneapi
@@ -568,7 +563,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_HDFS:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux_intel)

From 7ba6489eb7d4bad1ed2da7a6d97ef67ae93f9d1d Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 17:06:04 -0500
Subject: [PATCH 13/35] remove ros3 option

---
 .github/workflows/cmake-script.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 76ace4a5bae..43dad040300 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -102,7 +102,6 @@ jobs:
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest script (Windows)
@@ -188,7 +187,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux)
@@ -286,7 +284,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (MacOS_latest)
@@ -369,7 +366,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux S3)
@@ -467,7 +463,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Windows_intel) with oneapi
@@ -562,7 +557,6 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
-            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
 
       - name: Run ctest (Linux_intel)

From 2e3b45ae2e4dd3bd5543b4a41ef4833449c00163 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 19 Sep 2024 17:13:35 -0500
Subject: [PATCH 14/35] TOOLSET option is not working

---
 .github/workflows/cmake-script.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 43dad040300..c41caabb997 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -456,7 +456,7 @@ jobs:
             set (CTEST_SITE_EXT "GH-Windows.Intel")
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-            set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
+            #set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
@@ -550,7 +550,6 @@ jobs:
             set (CTEST_SITE_EXT "GH-Linux.Intel")
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-            set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")

From 3bab868237394dcb73164aa617768b9c07d310c7 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 20 Sep 2024 09:36:57 -0500
Subject: [PATCH 15/35] Force fortran off - change to just http

---
 .github/workflows/cmake-script.yml    | 12 ++++++------
 CTestConfig.cmake                     |  2 +-
 config/cmake/scripts/HDF5config.cmake |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index c41caabb997..eec1b2c5326 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -98,7 +98,7 @@ jobs:
               set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-              #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
@@ -183,7 +183,7 @@ jobs:
             set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
@@ -280,7 +280,7 @@ jobs:
             set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
@@ -362,7 +362,7 @@ jobs:
             set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
@@ -459,7 +459,7 @@ jobs:
             #set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
@@ -552,7 +552,7 @@ jobs:
             set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
-            #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 62beafc0c12..fde442b1e61 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -18,7 +18,7 @@
 set (CTEST_PROJECT_NAME "HDF5")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
-set (CTEST_DROP_METHOD "https")
+set (CTEST_DROP_METHOD "http")
 if (CTEST_DROP_SITE_INIT)
   set (CTEST_DROP_SITE "${CTEST_DROP_SITE_INIT}")
 else ()
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 6ec34815e9f..d4d8f3a685d 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -178,7 +178,7 @@ if (NOT DEFINED HPC)
       message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2022, VS202264, VS2019, VS201964")
     endif ()
   ##  Set the following to unique id your computer  ##
-    set (CTEST_SITE "WIN10${BUILD_GENERATOR}.XXXX")
+    set (CTEST_SITE "WIN10${BUILD_GENERATOR}.${CTEST_SITE_EXT}")
   else ()
     if (MINGW)
       set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
@@ -187,9 +187,9 @@ if (NOT DEFINED HPC)
     endif ()
   ##  Set the following to unique id your computer  ##
     if (APPLE)
-      set (CTEST_SITE "MAC.XXXX")
+      set (CTEST_SITE "MAC.${CTEST_SITE_EXT}")
     else ()
-      set (CTEST_SITE "LINUX.XXXX")
+      set (CTEST_SITE "LINUX.${CTEST_SITE_EXT}")
     endif ()
     if (APPLE)
       execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)

From 7773de2dd160e99069ce187eb4317765c02e321a Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 20 Sep 2024 09:52:40 -0500
Subject: [PATCH 16/35] Report to hdfgroup cdash

---
 .github/workflows/cmake-script.yml | 48 +++++++++++++++---------------
 CTestConfig.cmake                  |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index eec1b2c5326..8f04091e7c9 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -93,9 +93,9 @@ jobs:
             path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
             write-mode: overwrite
             contents: |
-              set (CTEST_SITE_EXT "GH-Windows.VScl")
-              set (CTEST_DROP_SITE_INIT "my.cdash.org")
-              set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+              #set (CTEST_SITE_EXT "GH-Windows.VScl")
+              #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+              #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -107,7 +107,7 @@ jobs:
       - name: Run ctest script (Windows)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -178,9 +178,9 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            set (CTEST_SITE_EXT "GH-Linux.Gcc")
-            set (CTEST_DROP_SITE_INIT "my.cdash.org")
-            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            #set (CTEST_SITE_EXT "GH-Linux.Gcc")
+            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -192,7 +192,7 @@ jobs:
       - name: Run ctest (Linux)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-GCC,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -275,9 +275,9 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            set (CTEST_SITE_EXT "GH-Mac.Clang")
-            set (CTEST_DROP_SITE_INIT "my.cdash.org")
-            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            #set (CTEST_SITE_EXT "GH-Mac.Clang")
+            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -290,7 +290,7 @@ jobs:
         id: run-ctest
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Clang,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -357,9 +357,9 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            set (CTEST_SITE_EXT "GH-Linux.S3")
-            set (CTEST_DROP_SITE_INIT "my.cdash.org")
-            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            #set (CTEST_SITE_EXT "GH-Linux.S3")
+            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -371,7 +371,7 @@ jobs:
       - name: Run ctest (Linux S3)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-S3,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -453,9 +453,9 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            set (CTEST_SITE_EXT "GH-Windows.Intel")
-            set (CTEST_DROP_SITE_INIT "my.cdash.org")
-            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            #set (CTEST_SITE_EXT "GH-Windows.Intel")
+            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             #set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -474,7 +474,7 @@ jobs:
           SIGNTOOLDIR: ${{ github.workspace }}/Microsoft.Windows.SDK.BuildTools/bin/10.0.22621.0/x64
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Intel,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: pwsh
         continue-on-error: true
 
@@ -547,9 +547,9 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            set (CTEST_SITE_EXT "GH-Linux.Intel")
-            set (CTEST_DROP_SITE_INIT "my.cdash.org")
-            set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            #set (CTEST_SITE_EXT "GH-Linux.Intel")
+            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -565,7 +565,7 @@ jobs:
           CXX: ${{ steps.setup-fortran.outputs.cxx }}
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Intel,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index fde442b1e61..62beafc0c12 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -18,7 +18,7 @@
 set (CTEST_PROJECT_NAME "HDF5")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
-set (CTEST_DROP_METHOD "http")
+set (CTEST_DROP_METHOD "https")
 if (CTEST_DROP_SITE_INIT)
   set (CTEST_DROP_SITE "${CTEST_DROP_SITE_INIT}")
 else ()

From e76843cfbf3ebd2219a82ed090ccf25272654938 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 20 Sep 2024 10:13:01 -0500
Subject: [PATCH 17/35] Change SITE name syntax

---
 config/cmake/scripts/HDF5config.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index d4d8f3a685d..02e424d459b 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -178,7 +178,7 @@ if (NOT DEFINED HPC)
       message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2022, VS202264, VS2019, VS201964")
     endif ()
   ##  Set the following to unique id your computer  ##
-    set (CTEST_SITE "WIN10${BUILD_GENERATOR}.${CTEST_SITE_EXT}")
+    set (CTEST_SITE "WIN10${BUILD_GENERATOR}-${CTEST_SITE_EXT}")
   else ()
     if (MINGW)
       set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
@@ -187,9 +187,9 @@ if (NOT DEFINED HPC)
     endif ()
   ##  Set the following to unique id your computer  ##
     if (APPLE)
-      set (CTEST_SITE "MAC.${CTEST_SITE_EXT}")
+      set (CTEST_SITE "MAC-${CTEST_SITE_EXT}")
     else ()
-      set (CTEST_SITE "LINUX.${CTEST_SITE_EXT}")
+      set (CTEST_SITE "LINUX-${CTEST_SITE_EXT}")
     endif ()
     if (APPLE)
       execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)

From 2852acfad168ca62498dc593c66053e064d275af Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 20 Sep 2024 10:29:35 -0500
Subject: [PATCH 18/35] expect CTEST_SITE to be set

---
 config/cmake/scripts/CTestScript.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 9e522f31795..ccb5ae8abdc 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -22,9 +22,9 @@ if (NOT SITE_OS_NAME)
   ## machine name not provided - attempt to discover with uname
   ## -- set hostname
   ## --------------------------
-  find_program (HOSTNAME_CMD NAMES hostname)
-  execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME)
-  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
+  #find_program (HOSTNAME_CMD NAMES hostname)
+  #execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME)
+  #set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
   find_program (UNAME NAMES uname)
   macro (getuname name flag)
     execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}")

From 9c81afcf70dbe2857518eafd1ce09e927c8ca8fd Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 20 Sep 2024 11:11:56 -0500
Subject: [PATCH 19/35] Fix CTEST_SITE at beginning

---
 .github/workflows/cmake-script.yml      | 18 ++++++------------
 config/cmake/examples/CTestScript.cmake |  6 +++---
 config/cmake/scripts/HDF5config.cmake   | 12 +++++++++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 8f04091e7c9..997c08fab1c 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -93,8 +93,7 @@ jobs:
             path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
             write-mode: overwrite
             contents: |
-              #set (CTEST_SITE_EXT "GH-Windows.VScl")
-              #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+              set (CTEST_DROP_SITE_INIT "my.cdash.org")
               #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -178,8 +177,7 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            #set (CTEST_SITE_EXT "GH-Linux.Gcc")
-            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -275,8 +273,7 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            #set (CTEST_SITE_EXT "GH-Mac.Clang")
-            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -357,8 +354,7 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            #set (CTEST_SITE_EXT "GH-Linux.S3")
-            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -453,8 +449,7 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            #set (CTEST_SITE_EXT "GH-Windows.Intel")
-            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             #set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
@@ -547,8 +542,7 @@ jobs:
           path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
           write-mode: overwrite
           contents: |
-            #set (CTEST_SITE_EXT "GH-Linux.Intel")
-            #set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            set (CTEST_DROP_SITE_INIT "my.cdash.org")
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
diff --git a/config/cmake/examples/CTestScript.cmake b/config/cmake/examples/CTestScript.cmake
index 40f91fcbdf7..10091df9524 100644
--- a/config/cmake/examples/CTestScript.cmake
+++ b/config/cmake/examples/CTestScript.cmake
@@ -21,9 +21,9 @@ if (NOT SITE_OS_NAME)
   ## machine name not provided - attempt to discover with uname
   ## -- set hostname
   ## --------------------------
-  find_program (HOSTNAME_CMD NAMES hostname)
-  execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME)
-  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
+  #find_program (HOSTNAME_CMD NAMES hostname)
+  #execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME)
+  #set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
   find_program (UNAME NAMES uname)
   macro (getuname name flag)
     execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}")
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 02e424d459b..3461422f0e1 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -178,7 +178,9 @@ if (NOT DEFINED HPC)
       message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2022, VS202264, VS2019, VS201964")
     endif ()
   ##  Set the following to unique id your computer  ##
-    set (CTEST_SITE "WIN10${BUILD_GENERATOR}-${CTEST_SITE_EXT}")
+    if(NOT DEFINED CTEST_SITE)
+      set (CTEST_SITE "WIN10${BUILD_GENERATOR}-${CTEST_SITE_EXT}")
+    endif()
   else ()
     if (MINGW)
       set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
@@ -187,9 +189,13 @@ if (NOT DEFINED HPC)
     endif ()
   ##  Set the following to unique id your computer  ##
     if (APPLE)
-      set (CTEST_SITE "MAC-${CTEST_SITE_EXT}")
+      if(NOT DEFINED CTEST_SITE)
+        set (CTEST_SITE "MAC-${CTEST_SITE_EXT}")
+      endif()
     else ()
-      set (CTEST_SITE "LINUX-${CTEST_SITE_EXT}")
+      if(NOT DEFINED CTEST_SITE)
+        set (CTEST_SITE "LINUX-${CTEST_SITE_EXT}")
+      endif()
     endif ()
     if (APPLE)
       execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)

From 54d7f502c95939cac14d274a8829bfe1481e73a6 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 20 Sep 2024 12:35:10 -0500
Subject: [PATCH 20/35] Correct execute_process extra WS

---
 config/cmake/examples/CTestScript.cmake | 5 ++++-
 config/cmake/scripts/CTestScript.cmake  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/cmake/examples/CTestScript.cmake b/config/cmake/examples/CTestScript.cmake
index 10091df9524..aac987a49c6 100644
--- a/config/cmake/examples/CTestScript.cmake
+++ b/config/cmake/examples/CTestScript.cmake
@@ -22,7 +22,7 @@ if (NOT SITE_OS_NAME)
   ## -- set hostname
   ## --------------------------
   #find_program (HOSTNAME_CMD NAMES hostname)
-  #execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME)
+  #execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
   #set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
   find_program (UNAME NAMES uname)
   macro (getuname name flag)
@@ -30,8 +30,11 @@ if (NOT SITE_OS_NAME)
   endmacro ()
 
   getuname (osname -s)
+  string(STRIP ${osname} osname)
   getuname (osrel  -r)
+  string(STRIP ${osrel} osrel)
   getuname (cpu    -m)
+  string(STRIP ${cpu} cpu)
   message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")
 
   set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index ccb5ae8abdc..aa86d5e02d0 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -23,7 +23,7 @@ if (NOT SITE_OS_NAME)
   ## -- set hostname
   ## --------------------------
   #find_program (HOSTNAME_CMD NAMES hostname)
-  #execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME)
+  #execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
   #set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
   find_program (UNAME NAMES uname)
   macro (getuname name flag)
@@ -31,8 +31,11 @@ if (NOT SITE_OS_NAME)
   endmacro ()
 
   getuname (osname -s)
+  string(STRIP ${osname} osname)
   getuname (osrel  -r)
+  string(STRIP ${osrel} osrel)
   getuname (cpu    -m)
+  string(STRIP ${cpu} cpu)
   message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")
 
   set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")

From 5d83e45233bd8047877244f4791126b673957646 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 23 Sep 2024 11:56:56 -0500
Subject: [PATCH 21/35] Correct check for ignore inputs

---
 .github/workflows/daily-build.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index ef4bd1ed025..982541e4639 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -37,6 +37,13 @@ jobs:
 
     - run: echo "hdf5 base name is ${{ steps.gethdf5base.outputs.HDF5_NAME_BASE }}."
 
+    - name: Read inputs
+      id: getinputs
+      run: |
+        echo "INPUTS_IGNORE=${{ github.event.inputs.use_ignore }}" >> $GITHUB_OUTPUT
+
+    - run: echo "use_ignore is ${{ steps.getinputs.outputs.INPUTS_IGNORE }}."
+
   call-workflow-tarball:
     needs: [get-old-names]
     uses: ./.github/workflows/tarball.yml
@@ -104,5 +111,5 @@ jobs:
       file_base: ${{ needs.get-old-names.outputs.hdf5-name }}
       use_tag: snapshot
       use_environ: snapshots
-    if: ${{ (needs.call-workflow-tarball.outputs.has_changes == 'true') && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
 

From ed61b406b27a7f4900308541a261147a340f8d9c Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 23 Sep 2024 12:10:25 -0500
Subject: [PATCH 22/35] Correct CI checks

---
 .github/workflows/tarball.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index a77c0418d45..2dd3abfea05 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -67,7 +67,7 @@ jobs:
       with:
         seconds: 86400 # One day in seconds
         branch: '${{ steps.get-branch-name.outputs.branch_ref }}'
-      if: ${{ inputs.use_environ == 'snapshots' }}
+      if: ${{ (inputs.use_environ == 'snapshots' && inputs.use_ignore == 'check') }}
 
     - run: echo "You have ${{ steps.check-new-commits.outputs.new-commits-number }} new commit(s) in ${{ steps.get-branch-name.outputs.BRANCH_REF }} ✅!"
       if: ${{ steps.check-new-commits.outputs.has-new-commits == 'true' }}
@@ -78,7 +78,7 @@ jobs:
     name: Create a source tarball
     runs-on: ubuntu-latest
     needs: check_commits
-    if: ${{ ((inputs.use_environ == 'snapshots') && (needs.check_commits.outputs.has_changes == 'true')) || (inputs.use_environ  == 'release') }}
+    if: ${{ ((inputs.use_environ == 'snapshots') && ((needs.check_commits.outputs.has_changes == 'true') || (inputs.use_ignore == 'ignore'))) || (inputs.use_environ  == 'release') }}
     outputs:
       file_base: ${{ steps.set-file-base.outputs.FILE_BASE }}
       source_base: ${{ steps.version.outputs.SOURCE_TAG }}

From aca19e46319bb544f68130537976c785ddb05e30 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 24 Sep 2024 08:35:08 -0500
Subject: [PATCH 23/35] correct macos preset names

---
 .github/workflows/cmake-bintest.yml |  2 +-
 HDF5Examples/CMakePresets.json      | 49 ++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cmake-bintest.yml b/.github/workflows/cmake-bintest.yml
index 379db3a2ca5..3952cf80fa8 100644
--- a/.github/workflows/cmake-bintest.yml
+++ b/.github/workflows/cmake-bintest.yml
@@ -201,6 +201,6 @@ jobs:
           HDF5_PLUGIN_PATH: ${{ steps.set-hdf5lib-name.outputs.HDF5_PLUGIN_PATH }}
         run: |
           cd "${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}/share/HDF5Examples"
-          cmake --workflow --preset=ci-StdShar-MACOS-Clang --fresh
+          cmake --workflow --preset=ci-StdShar-macos-Clang --fresh
         shell: bash
 
diff --git a/HDF5Examples/CMakePresets.json b/HDF5Examples/CMakePresets.json
index 0f2c1b5e013..b0fd7ada193 100644
--- a/HDF5Examples/CMakePresets.json
+++ b/HDF5Examples/CMakePresets.json
@@ -74,6 +74,24 @@
         "ci-StdShar"
       ]
     },
+    {
+      "name": "ci-StdShar-macos-Clang",
+      "description": "Clang Standard Config for macos (Release)",
+      "inherits": [
+        "ci-macos-Release-Clang",
+        "ci-StdJava",
+        "ci-StdShar"
+      ]
+    },
+    {
+      "name": "ci-StdShar-macos-GNUC",
+      "description": "GNUC Standard Config for macos (Release)",
+      "inherits": [
+        "ci-macos-Release-GNUC",
+        "ci-StdJava",
+        "ci-StdShar"
+      ]
+    },
     {
       "name": "ci-StdShar-Intel",
       "description": "Intel Standard Config for x64 (Release)",
@@ -111,6 +129,23 @@
         "ci-x64-Release-GNUC"
       ]
     },
+    {
+      "name": "ci-StdShar-macos-Clang",
+      "description": "Clang Standard Build for macos (Release)",
+      "configurePreset": "ci-StdShar-macos-Clang",
+      "inherits": [
+        "ci-macos-Release-Clang"
+      ]
+    },
+    {
+      "name": "ci-StdShar-macos-GNUC",
+      "description": "GNUC Standard Build for macos (Release)",
+      "configurePreset": "ci-StdShar-macos-GNUC",
+      "verbose": true,
+      "inherits": [
+        "ci-macos-Release-GNUC"
+      ]
+    },
     {
       "name": "ci-StdShar-Intel",
       "description": "Intel Standard Build for x64 (Release)",
@@ -137,10 +172,10 @@
       ]
     },
     {
-      "name": "ci-StdShar-MACOS-Clang",
-      "configurePreset": "ci-StdShar-Clang",
+      "name": "ci-StdShar-macos-Clang",
+      "configurePreset": "ci-StdShar-macos-Clang",
       "inherits": [
-        "ci-x64-Release-Clang"
+        "ci-macos-Release-Clang"
       ],
       "execution": {
         "noTestsAction": "error",
@@ -203,11 +238,11 @@
       ]
     },
     {
-      "name": "ci-StdShar-MACOS-Clang",
+      "name": "ci-StdShar-macos-Clang",
       "steps": [
-        {"type": "configure", "name": "ci-StdShar-Clang"},
-        {"type": "build", "name": "ci-StdShar-Clang"},
-        {"type": "test", "name": "ci-StdShar-MACOS-Clang"}
+        {"type": "configure", "name": "ci-StdShar-macos-Clang"},
+        {"type": "build", "name": "ci-StdShar-macos-Clang"},
+        {"type": "test", "name": "ci-StdShar-macos-Clang"}
       ]
     },
     {

From bf7af0b35133839aa9e55632f16817d5b1abe7b8 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 24 Sep 2024 10:51:25 -0500
Subject: [PATCH 24/35] Correct examples presets

---
 HDF5Examples/CMakePresets.json                |  13 +-
 .../config/cmake-presets/hidden-presets.json  | 191 ++++++++++++++++--
 2 files changed, 181 insertions(+), 23 deletions(-)

diff --git a/HDF5Examples/CMakePresets.json b/HDF5Examples/CMakePresets.json
index b0fd7ada193..0b7888a2d8a 100644
--- a/HDF5Examples/CMakePresets.json
+++ b/HDF5Examples/CMakePresets.json
@@ -181,11 +181,6 @@
         "noTestsAction": "error",
         "timeout": 180,
         "jobs": 2
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Darwin"
       }
     },
     {
@@ -253,6 +248,14 @@
         {"type": "test", "name": "ci-StdShar-GNUC"}
       ]
     },
+    {
+      "name": "ci-StdShar-macos-GNUC",
+      "steps": [
+        {"type": "configure", "name": "ci-StdShar-macos-GNUC"},
+        {"type": "build", "name": "ci-StdShar-macos-GNUC"},
+        {"type": "test", "name": "ci-StdShar-macos-GNUC"},
+      ]
+    },
     {
       "name": "ci-StdShar-Intel",
       "steps": [
diff --git a/HDF5Examples/config/cmake-presets/hidden-presets.json b/HDF5Examples/config/cmake-presets/hidden-presets.json
index 590e7ec7e1f..ede4a244bb8 100644
--- a/HDF5Examples/config/cmake-presets/hidden-presets.json
+++ b/HDF5Examples/config/cmake-presets/hidden-presets.json
@@ -10,7 +10,7 @@
       "binaryDir": "${sourceParentDir}/build/${presetName}",
       "installDir": "${sourceParentDir}/install/${presetName}"
     },
-   {
+    {
       "name": "ci-x64",
       "architecture": {
         "value": "x64",
@@ -21,7 +21,15 @@
     {
       "name": "ci-x86",
       "architecture": {
-        "value": "x86",
+        "value": "Win32",
+        "strategy": "external"
+      },
+      "hidden": true
+    },
+    {
+      "name": "ci-arm64",
+      "architecture": {
+        "value": "ARM64",
         "strategy": "external"
       },
       "hidden": true
@@ -47,25 +55,29 @@
         "CMAKE_C_COMPILER": "cl",
         "CMAKE_CXX_COMPILER": "cl"
       },
-      "toolset": {
-        "value": "host=x64",
-        "strategy": "external"
-      },
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       }
     },
+    {
+      "name": "ci-macos",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_OSX_ARCHITECTURES": "arm64;x86_64"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      }
+    },
     {
       "name": "ci-Clang",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_TOOLCHAIN_FILE": "config/toolchain/clang.cmake"
-      },
-      "toolset": {
-        "value": "host=x64",
-        "strategy": "external"
       }
     },
     {
@@ -78,21 +90,44 @@
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Linux"
-      },
-      "toolset": {
-        "value": "host=x64",
-        "strategy": "external"
       }
     },
     {
       "name": "ci-Intel",
+      "hidden": true
+    },
+    {
+      "name": "ci-Fortran",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "config/toolchain/intel.cmake"
+        "H5EX_BUILD_FORTRAN": "ON"
+      }
+    },
+    {
+      "name": "ci-Fortran-Clang",
+      "hidden": true,
+      "inherits": "ci-Fortran",
+      "cacheVariables": {
+        "CMAKE_Fortran_COMPILER":  {"type": "FILEPATH", "value": "gfortran"}
       },
-      "toolset": {
-        "value": "host=x64",
-        "strategy": "external"
+      "condition": {
+        "type": "matches",
+        "string": "${presetName}",
+        "regex": ".*-Clang"
+      }
+    },
+    {
+      "name": "ci-CPP",
+      "hidden": true,
+      "cacheVariables": {
+        "H5EX_BUILD_CPP_LIB": "ON"
+      }
+    },
+    {
+      "name": "ci-Java",
+      "hidden": true,
+      "cacheVariables": {
+        "H5EX_BUILD_JAVA": "ON"
       }
     },
     {
@@ -161,6 +196,50 @@
         "ci-GNUC"
       ]
     },
+    {
+      "name": "ci-macos-Debug-Clang",
+      "description": "Clang/LLVM for x64 (Debug)",
+      "hidden": true,
+      "inherits": [
+        "ci-base",
+        "ci-macos",
+        "ci-Debug",
+        "ci-Clang"
+      ]
+    },
+    {
+      "name": "ci-macos-Release-Clang",
+      "description": "Clang/LLVM for x64 (Release)",
+      "hidden": true,
+      "inherits": [
+        "ci-base",
+        "ci-macos",
+        "ci-Release",
+        "ci-Clang"
+      ]
+    },
+    {
+      "name": "ci-macos-Debug-GNUC",
+      "description": "GNUC for x64 (Debug)",
+      "hidden": true,
+      "inherits": [
+        "ci-base",
+        "ci-macos",
+        "ci-Debug",
+        "ci-GNUC"
+      ]
+    },
+    {
+      "name": "ci-macos-Release-GNUC",
+      "description": "GNUC for x64 (Release)",
+      "hidden": true,
+      "inherits": [
+        "ci-base",
+        "ci-macos",
+        "ci-Release",
+        "ci-GNUC"
+      ]
+    },
     {
       "name": "ci-x64-Debug-Intel",
       "description": "Intel for x64 (Debug)",
@@ -242,6 +321,38 @@
         "ci-base"
       ]
     },
+    {
+      "name": "ci-macos-Debug-Clang",
+      "configurePreset": "ci-macos-Debug-Clang",
+      "hidden": true,
+      "inherits": [
+        "ci-base"
+      ]
+    },
+    {
+      "name": "ci-macos-Release-Clang",
+      "configurePreset": "ci-macos-Release-Clang",
+      "hidden": true,
+      "inherits": [
+        "ci-base"
+      ]
+    },
+    {
+      "name": "ci-macos-Debug-GNUC",
+      "configurePreset": "ci-macos-Debug-GNUC",
+      "hidden": true,
+      "inherits": [
+        "ci-base"
+      ]
+    },
+    {
+      "name": "ci-macos-Release-GNUC",
+      "configurePreset": "ci-macos-Release-GNUC",
+      "hidden": true,
+      "inherits": [
+        "ci-base"
+      ]
+    },
     {
       "name": "ci-x64-Debug-Intel",
       "configurePreset": "ci-x64-Debug-Intel",
@@ -327,6 +438,38 @@
         "ci-base"
       ]
     },
+    {
+      "name": "ci-macos-Debug-Clang",
+      "configurePreset": "ci-macos-Debug-Clang",
+      "hidden": true,
+      "inherits": [
+        "ci-base"
+      ]
+    },
+    {
+      "name": "ci-macos-Release-Clang",
+      "configurePreset": "ci-macos-Release-Clang",
+      "hidden": true,
+      "inherits": [
+        "ci-base"
+      ]
+    },
+    {
+      "name": "ci-macos-Debug-GNUC",
+      "configurePreset": "ci-macos-Debug-GNUC",
+      "hidden": true,
+      "inherits": [
+        "ci-base"
+      ]
+    },
+    {
+      "name": "ci-macos-Release-GNUC",
+      "configurePreset": "ci-macos-Release-GNUC",
+      "hidden": true,
+      "inherits": [
+        "ci-base"
+      ]
+    },
     {
       "name": "ci-x64-Debug-Intel",
       "configurePreset": "ci-x64-Debug-Intel",
@@ -371,6 +514,18 @@
       "hidden": true,
       "inherits": "ci-base"
     },
+    {
+      "name": "ci-macos-Release-Clang",
+      "configurePreset": "ci-macos-Release-Clang",
+      "hidden": true,
+      "inherits": "ci-base"
+    },
+    {
+      "name": "ci-macos-Release-GNUC",
+      "configurePreset": "ci-macos-Release-GNUC",
+      "hidden": true,
+      "inherits": "ci-base"
+    },
     {
       "name": "ci-x64-Release-Intel",
       "configurePreset": "ci-x64-Release-Intel",

From 01ab9030e3a914f75428228737bbece957b4fc06 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 24 Sep 2024 11:48:22 -0500
Subject: [PATCH 25/35] Remove comma typo

---
 HDF5Examples/CMakePresets.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HDF5Examples/CMakePresets.json b/HDF5Examples/CMakePresets.json
index 0b7888a2d8a..2f0ddf677b8 100644
--- a/HDF5Examples/CMakePresets.json
+++ b/HDF5Examples/CMakePresets.json
@@ -253,7 +253,7 @@
       "steps": [
         {"type": "configure", "name": "ci-StdShar-macos-GNUC"},
         {"type": "build", "name": "ci-StdShar-macos-GNUC"},
-        {"type": "test", "name": "ci-StdShar-macos-GNUC"},
+        {"type": "test", "name": "ci-StdShar-macos-GNUC"}
       ]
     },
     {

From 802c8f90349e59532b058cb96725635a4fdd3c0f Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 24 Sep 2024 12:42:27 -0500
Subject: [PATCH 26/35] Add missing test entry

---
 HDF5Examples/CMakePresets.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/HDF5Examples/CMakePresets.json b/HDF5Examples/CMakePresets.json
index 2f0ddf677b8..600aa5e2d1d 100644
--- a/HDF5Examples/CMakePresets.json
+++ b/HDF5Examples/CMakePresets.json
@@ -183,6 +183,13 @@
         "jobs": 2
       }
     },
+    {
+      "name": "ci-StdShar-macos-GNUC",
+      "configurePreset": "ci-StdShar-macos-GNUC",
+      "inherits": [
+        "ci-macos-Release-GNUC"
+      ]
+    },
     {
       "name": "ci-StdShar-GNUC",
       "configurePreset": "ci-StdShar-GNUC",

From ab4caef3597d878c0d25b1e2d7607b31287ebb8c Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 24 Sep 2024 13:54:13 -0500
Subject: [PATCH 27/35] Correct misnamed variables

---
 HDF5Examples/Using_CMake.txt                     | 10 +++++-----
 HDF5Examples/config/cmake/HDFExampleMacros.cmake |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HDF5Examples/Using_CMake.txt b/HDF5Examples/Using_CMake.txt
index baef3565194..c543300092b 100644
--- a/HDF5Examples/Using_CMake.txt
+++ b/HDF5Examples/Using_CMake.txt
@@ -90,11 +90,11 @@ These steps are described in more detail below.
             * MinGW Makefiles
             * NMake Makefiles
             * Unix Makefiles
-            * Visual Studio 15 2017
-            * Visual Studio 15 2017 Win64
-            * Visual Studio 16 2019
-            * Visual Studio 17 2022
-
+            * Visual Studio 15
+            * Visual Studio 15 Win64
+            * Visual Studio 17
+            * Visual Studio 17 Win64
+            * Visual Studio 19
 
         <options> is:
             * H5EX_BUILD_TESTING:BOOL=ON
diff --git a/HDF5Examples/config/cmake/HDFExampleMacros.cmake b/HDF5Examples/config/cmake/HDFExampleMacros.cmake
index bbb042177a3..dd2c46fba67 100644
--- a/HDF5Examples/config/cmake/HDFExampleMacros.cmake
+++ b/HDF5Examples/config/cmake/HDFExampleMacros.cmake
@@ -137,7 +137,7 @@ macro (HDF5_SUPPORT)
       set (FIND_HDF_COMPONENTS C shared)
     else ()
       set (FIND_HDF_COMPONENTS C static)
-      set (HDEXF_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE)
+      set (H5EX_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE)
       message (STATUS "Using static HDF5 - disable build of Java examples")
     endif ()
     if (H5EX_BUILD_FORTRAN)

From 3a37ddea5b46d1b27bec4bb9dc5c8701bf6c29eb Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 24 Sep 2024 16:43:38 -0500
Subject: [PATCH 28/35] mac presets need to choose arch

---
 HDF5Examples/CMakePresets.json                | 16 ++---
 .../config/cmake-presets/hidden-presets.json  | 68 +++++++++++--------
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/HDF5Examples/CMakePresets.json b/HDF5Examples/CMakePresets.json
index 600aa5e2d1d..1f722cc4e20 100644
--- a/HDF5Examples/CMakePresets.json
+++ b/HDF5Examples/CMakePresets.json
@@ -78,7 +78,7 @@
       "name": "ci-StdShar-macos-Clang",
       "description": "Clang Standard Config for macos (Release)",
       "inherits": [
-        "ci-macos-Release-Clang",
+        "ci-macos-arm64-Release-Clang",
         "ci-StdJava",
         "ci-StdShar"
       ]
@@ -87,7 +87,7 @@
       "name": "ci-StdShar-macos-GNUC",
       "description": "GNUC Standard Config for macos (Release)",
       "inherits": [
-        "ci-macos-Release-GNUC",
+        "ci-macos-arm64-Release-GNUC",
         "ci-StdJava",
         "ci-StdShar"
       ]
@@ -131,19 +131,19 @@
     },
     {
       "name": "ci-StdShar-macos-Clang",
-      "description": "Clang Standard Build for macos (Release)",
+      "description": "Clang Standard Build for macos-arm64 (Release)",
       "configurePreset": "ci-StdShar-macos-Clang",
       "inherits": [
-        "ci-macos-Release-Clang"
+        "ci-macos-arm64-Release-Clang"
       ]
     },
     {
       "name": "ci-StdShar-macos-GNUC",
-      "description": "GNUC Standard Build for macos (Release)",
+      "description": "GNUC Standard Build for macos-arm64 (Release)",
       "configurePreset": "ci-StdShar-macos-GNUC",
       "verbose": true,
       "inherits": [
-        "ci-macos-Release-GNUC"
+        "ci-macos-arm64-Release-GNUC"
       ]
     },
     {
@@ -175,7 +175,7 @@
       "name": "ci-StdShar-macos-Clang",
       "configurePreset": "ci-StdShar-macos-Clang",
       "inherits": [
-        "ci-macos-Release-Clang"
+        "ci-macos-arm64-Release-Clang"
       ],
       "execution": {
         "noTestsAction": "error",
@@ -187,7 +187,7 @@
       "name": "ci-StdShar-macos-GNUC",
       "configurePreset": "ci-StdShar-macos-GNUC",
       "inherits": [
-        "ci-macos-Release-GNUC"
+        "ci-macos-arm64-Release-GNUC"
       ]
     },
     {
diff --git a/HDF5Examples/config/cmake-presets/hidden-presets.json b/HDF5Examples/config/cmake-presets/hidden-presets.json
index ede4a244bb8..d38e802f1f6 100644
--- a/HDF5Examples/config/cmake-presets/hidden-presets.json
+++ b/HDF5Examples/config/cmake-presets/hidden-presets.json
@@ -62,10 +62,22 @@
       }
     },
     {
-      "name": "ci-macos",
+      "name": "ci-macos-arm64",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_OSX_ARCHITECTURES": "arm64;x86_64"
+        "CMAKE_OSX_ARCHITECTURES": "arm64"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      }
+    },
+    {
+      "name": "ci-macos-x86_64",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_OSX_ARCHITECTURES": "x86_64"
       },
       "condition": {
         "type": "equals",
@@ -197,45 +209,45 @@
       ]
     },
     {
-      "name": "ci-macos-Debug-Clang",
+      "name": "ci-macos-arm64-Debug-Clang",
       "description": "Clang/LLVM for x64 (Debug)",
       "hidden": true,
       "inherits": [
         "ci-base",
-        "ci-macos",
+        "ci-macos-arm64",
         "ci-Debug",
         "ci-Clang"
       ]
     },
     {
-      "name": "ci-macos-Release-Clang",
+      "name": "ci-macos-arm64-Release-Clang",
       "description": "Clang/LLVM for x64 (Release)",
       "hidden": true,
       "inherits": [
         "ci-base",
-        "ci-macos",
+        "ci-macos-arm64",
         "ci-Release",
         "ci-Clang"
       ]
     },
     {
-      "name": "ci-macos-Debug-GNUC",
+      "name": "ci-macos-arm64-Debug-GNUC",
       "description": "GNUC for x64 (Debug)",
       "hidden": true,
       "inherits": [
         "ci-base",
-        "ci-macos",
+        "ci-macos-arm64",
         "ci-Debug",
         "ci-GNUC"
       ]
     },
     {
-      "name": "ci-macos-Release-GNUC",
+      "name": "ci-macos-arm64-Release-GNUC",
       "description": "GNUC for x64 (Release)",
       "hidden": true,
       "inherits": [
         "ci-base",
-        "ci-macos",
+        "ci-macos-arm64",
         "ci-Release",
         "ci-GNUC"
       ]
@@ -322,32 +334,32 @@
       ]
     },
     {
-      "name": "ci-macos-Debug-Clang",
-      "configurePreset": "ci-macos-Debug-Clang",
+      "name": "ci-macos-arm64-Debug-Clang",
+      "configurePreset": "ci-macos-arm64-Debug-Clang",
       "hidden": true,
       "inherits": [
         "ci-base"
       ]
     },
     {
-      "name": "ci-macos-Release-Clang",
-      "configurePreset": "ci-macos-Release-Clang",
+      "name": "ci-macos-arm64-Release-Clang",
+      "configurePreset": "ci-macos-arm64-Release-Clang",
       "hidden": true,
       "inherits": [
         "ci-base"
       ]
     },
     {
-      "name": "ci-macos-Debug-GNUC",
-      "configurePreset": "ci-macos-Debug-GNUC",
+      "name": "ci-macos-arm64-Debug-GNUC",
+      "configurePreset": "ci-macos-arm64-Debug-GNUC",
       "hidden": true,
       "inherits": [
         "ci-base"
       ]
     },
     {
-      "name": "ci-macos-Release-GNUC",
-      "configurePreset": "ci-macos-Release-GNUC",
+      "name": "ci-macos-arm64-Release-GNUC",
+      "configurePreset": "ci-macos-arm64-Release-GNUC",
       "hidden": true,
       "inherits": [
         "ci-base"
@@ -447,24 +459,24 @@
       ]
     },
     {
-      "name": "ci-macos-Release-Clang",
-      "configurePreset": "ci-macos-Release-Clang",
+      "name": "ci-macos-arm64-Release-Clang",
+      "configurePreset": "ci-macos-arm64-Release-Clang",
       "hidden": true,
       "inherits": [
         "ci-base"
       ]
     },
     {
-      "name": "ci-macos-Debug-GNUC",
-      "configurePreset": "ci-macos-Debug-GNUC",
+      "name": "ci-macos-arm64-Debug-GNUC",
+      "configurePreset": "ci-macos-arm64-Debug-GNUC",
       "hidden": true,
       "inherits": [
         "ci-base"
       ]
     },
     {
-      "name": "ci-macos-Release-GNUC",
-      "configurePreset": "ci-macos-Release-GNUC",
+      "name": "ci-macos-arm64-Release-GNUC",
+      "configurePreset": "ci-macos-arm64-Release-GNUC",
       "hidden": true,
       "inherits": [
         "ci-base"
@@ -515,14 +527,14 @@
       "inherits": "ci-base"
     },
     {
-      "name": "ci-macos-Release-Clang",
-      "configurePreset": "ci-macos-Release-Clang",
+      "name": "ci-macos-arm64-Release-Clang",
+      "configurePreset": "ci-macos-arm64-Release-Clang",
       "hidden": true,
       "inherits": "ci-base"
     },
     {
-      "name": "ci-macos-Release-GNUC",
-      "configurePreset": "ci-macos-Release-GNUC",
+      "name": "ci-macos-arm64-Release-GNUC",
+      "configurePreset": "ci-macos-arm64-Release-GNUC",
       "hidden": true,
       "inherits": "ci-base"
     },

From aca218df3a5cbc12d143985f9ef0b6bd48e1234c Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 24 Sep 2024 17:34:57 -0500
Subject: [PATCH 29/35] Add missing ignore option

---
 .github/workflows/daily-build.yml | 1 +
 .github/workflows/tarball.yml     | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index 982541e4639..e2a7969299d 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -48,6 +48,7 @@ jobs:
     needs: [get-old-names]
     uses: ./.github/workflows/tarball.yml
     with:
+      use_ignore: ${{ needs.get-base-names.outputs.run-ignore }}
       use_tag: snapshot
       use_environ: snapshots
 
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index 2dd3abfea05..f948e4d27e6 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -4,6 +4,11 @@ name: hdf5 dev tarball
 on:
   workflow_call:
     inputs:
+      use_ignore:
+        description: 'Ignore has changes check'
+        type: string
+        required: false
+        default: check
       use_tag:
         description: 'Release version tag'
         type: string
@@ -43,6 +48,8 @@ jobs:
       branch_ref: ${{ steps.get-branch-name.outputs.BRANCH_REF }}
       branch_sha: ${{ steps.get-branch-sha.outputs.BRANCH_SHA }}
     steps:
+    - uses: actions/checkout@v4
+
     - name: Get branch name
       id: get-branch-name
       env:

From cf057a86012aa317690375a97263254ba82b4df9 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 25 Sep 2024 10:07:52 -0500
Subject: [PATCH 30/35] Correct issues with ignore

---
 .github/workflows/cmake-script.yml |  6 ++++++
 .github/workflows/daily-build.yml  | 14 +++++++-------
 .github/workflows/tarball.yml      |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 997c08fab1c..c43befdc0ba 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -94,6 +94,7 @@ jobs:
             write-mode: overwrite
             contents: |
               set (CTEST_DROP_SITE_INIT "my.cdash.org")
+              # Change following line to submit to your CDash dashboard to a different CDash project
               #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -178,6 +179,7 @@ jobs:
           write-mode: overwrite
           contents: |
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -274,6 +276,7 @@ jobs:
           write-mode: overwrite
           contents: |
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -355,6 +358,7 @@ jobs:
           write-mode: overwrite
           contents: |
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
@@ -450,6 +454,7 @@ jobs:
           write-mode: overwrite
           contents: |
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             #set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
@@ -543,6 +548,7 @@ jobs:
           write-mode: overwrite
           contents: |
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
+            # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index e2a7969299d..d3e50b41f65 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       use_ignore:
-        description: 'Ignore has changes check'
+        description: 'Ignore has_changes check'
         type: string
         required: false
         default: check
@@ -48,7 +48,7 @@ jobs:
     needs: [get-old-names]
     uses: ./.github/workflows/tarball.yml
     with:
-      use_ignore: ${{ needs.get-base-names.outputs.run-ignore }}
+      use_ignore: ${{ needs.get-old-names.outputs.run-ignore }}
       use_tag: snapshot
       use_environ: snapshots
 
@@ -58,7 +58,7 @@ jobs:
     with:
       file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
       use_environ: snapshots
-    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-ctest:
     needs: [get-old-names, call-workflow-tarball]
@@ -78,7 +78,7 @@ jobs:
         AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
         AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
         AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
-    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-abi:
     needs: [get-old-names, call-workflow-tarball, call-workflow-ctest]
@@ -88,7 +88,7 @@ jobs:
       file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
       use_tag: snapshot
       use_environ: snapshots
-    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-release:
     needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi]
@@ -101,7 +101,7 @@ jobs:
       file_sha: ${{ needs.call-workflow-tarball.outputs.file_sha }}
       use_tag: snapshot
       use_environ: snapshots
-    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
 
   call-workflow-remove:
     needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi, call-workflow-release]
@@ -112,5 +112,5 @@ jobs:
       file_base: ${{ needs.get-old-names.outputs.hdf5-name }}
       use_tag: snapshot
       use_environ: snapshots
-    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
+    if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
 
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index f948e4d27e6..483547f8af1 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -5,7 +5,7 @@ on:
   workflow_call:
     inputs:
       use_ignore:
-        description: 'Ignore has changes check'
+        description: 'Ignore has_changes check'
         type: string
         required: false
         default: check

From 4d87a7866ff58db3e1b4b17a498a48cfa4cdebfa Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 25 Sep 2024 11:18:48 -0500
Subject: [PATCH 31/35] Uncomment and add script options

---
 .github/workflows/cmake-script.yml     | 12 ++++++++++++
 config/cmake/scripts/CTestScript.cmake |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index c43befdc0ba..90546d375cf 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -103,6 +103,8 @@ jobs:
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
 
       - name: Run ctest script (Windows)
         run: |
@@ -188,6 +190,8 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
 
       - name: Run ctest (Linux)
         run: |
@@ -285,6 +289,8 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
 
       - name: Run ctest (MacOS_latest)
         id: run-ctest
@@ -367,6 +373,8 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
 
       - name: Run ctest (Linux S3)
         run: |
@@ -464,6 +472,8 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
 
       - name: Run ctest (Windows_intel) with oneapi
         env:
@@ -557,6 +567,8 @@ jobs:
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
 
       - name: Run ctest (Linux_intel)
         env:
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index aa86d5e02d0..d7a3febcfbb 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -22,12 +22,12 @@ if (NOT SITE_OS_NAME)
   ## machine name not provided - attempt to discover with uname
   ## -- set hostname
   ## --------------------------
-  #find_program (HOSTNAME_CMD NAMES hostname)
-  #execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
-  #set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
+  find_program (HOSTNAME_CMD NAMES hostname)
+  execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
   find_program (UNAME NAMES uname)
   macro (getuname name flag)
-    execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}")
+    execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}" OUTPUT_STRIP_TRAILING_WHITESPACE)
   endmacro ()
 
   getuname (osname -s)

From bbe2aadc41db7f75b4cd10fa420549783f21c77d Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 25 Sep 2024 12:44:04 -0500
Subject: [PATCH 32/35] Add log-level verbose

---
 .github/workflows/cmake-script.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 90546d375cf..916e298e205 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -96,6 +96,7 @@ jobs:
               set (CTEST_DROP_SITE_INIT "my.cdash.org")
               # Change following line to submit to your CDash dashboard to a different CDash project
               #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
               set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -183,6 +184,7 @@ jobs:
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -282,6 +284,8 @@ jobs:
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (NO_MAC_FORTRAN "ON")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -366,6 +370,7 @@ jobs:
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -465,6 +470,7 @@ jobs:
             # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
             #set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
@@ -560,6 +566,7 @@ jobs:
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")

From 4113a6e4e389a15604f8aeb9e6956e65cec49f65 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 25 Sep 2024 13:01:25 -0500
Subject: [PATCH 33/35] Correct mac sets

---
 .github/workflows/cmake-script.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 916e298e205..5db7c0fa1ac 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -284,7 +284,6 @@ jobs:
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-            set (NO_MAC_FORTRAN "ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")

From 5e9dfbaa491f200451f4ee44fd0add537fd34caa Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 25 Sep 2024 16:56:36 -0500
Subject: [PATCH 34/35] Update test scripts

---
 .github/workflows/cmake-script.yml      |  3 +-
 config/cmake/examples/CTestScript.cmake | 47 +++++++++++++------------
 config/cmake/scripts/CTestScript.cmake  |  6 ++--
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 5db7c0fa1ac..7c1d4274654 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -468,8 +468,9 @@ jobs:
             set (CTEST_DROP_SITE_INIT "my.cdash.org")
             # Change following line to submit to your CDash dashboard to a different CDash project
             #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
-            #set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
+            set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 2024,fortran=ifx")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
+            set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
             set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
diff --git a/config/cmake/examples/CTestScript.cmake b/config/cmake/examples/CTestScript.cmake
index aac987a49c6..3c7425601f7 100644
--- a/config/cmake/examples/CTestScript.cmake
+++ b/config/cmake/examples/CTestScript.cmake
@@ -21,12 +21,12 @@ if (NOT SITE_OS_NAME)
   ## machine name not provided - attempt to discover with uname
   ## -- set hostname
   ## --------------------------
-  #find_program (HOSTNAME_CMD NAMES hostname)
-  #execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
-  #set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
+  find_program (HOSTNAME_CMD NAMES hostname)
+  execute_process (COMMAND ${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
   find_program (UNAME NAMES uname)
   macro (getuname name flag)
-    execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}")
+    execute_process (COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}" OUTPUT_STRIP_TRAILING_WHITESPACE)
   endmacro ()
 
   getuname (osname -s)
@@ -53,15 +53,15 @@ endif ()
 set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
 
 # Launchers work only with Makefile and Ninja generators.
-if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja" OR LOCAL_SKIP_TEST)
-  set(CTEST_USE_LAUNCHERS 0)
-  set(ENV{CTEST_USE_LAUNCHERS_DEFAULT} 0)
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=OFF")
-else()
-  set(CTEST_USE_LAUNCHERS 1)
-  set(ENV{CTEST_USE_LAUNCHERS_DEFAULT} 1)
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON")
-endif()
+if (NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja" OR LOCAL_SKIP_TEST)
+  set (CTEST_USE_LAUNCHERS 0)
+  set (ENV{CTEST_USE_LAUNCHERS_DEFAULT} 0)
+  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=OFF")
+else ()
+  set (CTEST_USE_LAUNCHERS 1)
+  set (ENV{CTEST_USE_LAUNCHERS_DEFAULT} 1)
+  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON")
+endif ()
 
 #-----------------------------------------------------------------------------
 # MacOS machines need special options
@@ -80,7 +80,6 @@ endif ()
 set (NEED_REPOSITORY_CHECKOUT 0)
 set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
 if (CTEST_USE_TAR_SOURCE)
-  ## Uncompress source if tar or zip file provided
   ## --------------------------
   if (WIN32 AND NOT MINGW)
     message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
@@ -101,10 +100,10 @@ endif ()
 ## Clear the build directory
 ## --------------------------
 set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
-if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
-  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
-else ()
+if (NOT EXISTS "${CTEST_BINARY_DIRECTORY}")
   file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+else ()
+  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
 endif ()
 
 # Use multiple CPU cores to build
@@ -125,13 +124,15 @@ endif ()
 #-----------------------------------------------------------------------------
 # Initialize the CTEST commands
 #------------------------------
-set(CTEST_CONFIGURE_TOOLSET  "")
-if(CMAKE_GENERATOR_TOOLSET)
-  set(CTEST_CONFIGURE_TOOLSET  "-T${CMAKE_GENERATOR_TOOLSET}")
+if (CMAKE_GENERATOR_TOOLSET)
+  set (CTEST_CONFIGURE_TOOLSET  "\"-T${CMAKE_GENERATOR_TOOLSET}\"")
+else ()
+  set (CTEST_CONFIGURE_TOOLSET)
 endif()
-set(CTEST_CONFIGURE_ARCHITECTURE  "")
-if(CMAKE_GENERATOR_ARCHITECTURE)
-  set(CTEST_CONFIGURE_ARCHITECTURE  "-A${CMAKE_GENERATOR_ARCHITECTURE}")
+if (CMAKE_GENERATOR_ARCHITECTURE)
+  set (CTEST_CONFIGURE_ARCHITECTURE  "\"-A${CMAKE_GENERATOR_ARCHITECTURE}\"")
+else ()
+  set (CTEST_CONFIGURE_ARCHITECTURE)
 endif()
 set (CTEST_CONFIGURE_COMMAND
     "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index d7a3febcfbb..45ca77b73d9 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -11,8 +11,7 @@
 #
 cmake_minimum_required (VERSION 3.18)
 ########################################################
-# This dashboard is maintained by The HDF Group
-# For any comments please contact cdashhelp@hdfgroup.org
+# For any comments please contact help@hdfgroup.org
 #
 ########################################################
 # -----------------------------------------------------------
@@ -65,7 +64,7 @@ else ()
 endif ()
 
 #-----------------------------------------------------------------------------
-# MAC machines need special option
+# MacOS machines need special options
 #-----------------------------------------------------------------------------
 if (APPLE)
   # Compiler choice
@@ -81,7 +80,6 @@ endif ()
 set (NEED_REPOSITORY_CHECKOUT 0)
 set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
 if (CTEST_USE_TAR_SOURCE)
-  ## Uncompress source if tar file provided
   ## --------------------------
   if (WIN32 AND NOT MINGW)
     message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")

From 5563863836aaf2b35a62040a0c12142b67c5a1eb Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 26 Sep 2024 07:41:12 -0500
Subject: [PATCH 35/35] Remove conflict

---
 config/cmake/scripts/CTestScript.cmake | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index d8bdf6c4a33..45ca77b73d9 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -11,10 +11,6 @@
 #
 cmake_minimum_required (VERSION 3.18)
 ########################################################
-<<<<<<< HEAD
-=======
-# This dashboard is maintained by The HDF Group
->>>>>>> branch 'develop' of https://github.com/HDFGroup/hdf5.git
 # For any comments please contact help@hdfgroup.org
 #
 ########################################################