Merge branch 'main' into v4.9.3-rc1-prep.wif

.github/workflows/run_tests_win_cygwin.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: windows-latest
     defaults:
       run:
-        shell: bash -eo pipefail -o igncr "{0}"
+        shell: C:/cygwin/bin/bash.exe -eo pipefail -o igncr "{0}"
 
     name: Cygwin-based Autotools tests
 
@@ -27,18 +27,20 @@ jobs:
 
     steps:
       - name: Fix line endings
+        shell: pwsh
         run: git config --global core.autocrlf input
 
       - uses: actions/checkout@v4
 
-      - uses: cygwin/cygwin-install-action@v2
+      - uses: cygwin/cygwin-install-action@v4
         with:
           platform: x86_64
+          install-dir: 'C:\cygwin'
           packages: >-
             git automake libtool autoconf2.5 make libhdf5-devel
             libhdf4-devel zipinfo libxml2-devel perl zlib-devel
             libzstd-devel libbz2-devel libaec-devel libzip-devel
-            libdeflate-devel gcc-core libcurl-devel libiconv-devel
+            libdeflate-devel gcc-core gcc-g++ libcurl-devel libiconv-devel
             libssl-devel libcrypt-devel
 
       - name: (Autotools) Run autoconf and friends
@@ -80,3 +82,72 @@ jobs:
         timeout-minutes: 30
         run: |
           make check -j8 SHELL=/bin/dash
+  
+  build-and-test-cmake:
+    name: Cygwin-based CMake tests
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: C:/cygwin/bin/bash.exe -eo pipefail -o igncr "{0}"
+
+    steps:
+
+      - run: git config --global core.autocrlf input
+        shell: pwsh
+      - uses: actions/checkout@v4
+      - uses: cygwin/cygwin-install-action@v4
+        with:
+          platform: x86_64
+          install-dir: 'C:\cygwin'
+          packages: >-
+            git automake libtool autoconf2.5 make libhdf5-devel
+            libhdf4-devel zipinfo libxml2-devel perl zlib-devel
+            libzstd-devel libbz2-devel libaec-devel libzip-devel
+            libdeflate-devel gcc-core gcc-g++ libcurl-devel libiconv-devel
+            libssl-devel libcrypt-devel cmake ninja make m4 diffutils unzip
+
+###
+# Configure and build
+###
+
+      - name: (CMake) Configure Build
+        env:
+          MAKE: "/usr/bin/make"
+          CXX: "/usr/bin/g++"
+        run: |
+          /usr/bin/cmake \
+          -G"Unix Makefiles" \
+          -B build \
+          -S . \
+          -DCMAKE_INSTALL_PREFIX=/tmp \
+          -DBUILD_SHARED_LIBS=ON \
+          -DNETCDF_ENABLE_NETCDF_4=ON \
+          -DNETCDF_BUILD_UTILITIES=ON \
+          -DNETCDF_ENABLE_TESTS=ON \
+          -DNETCDF_ENABLE_HDF5=ON \
+          -DNETCDF_ENABLE_NCZARR=TRUE \
+          -DNETCDF_ENABLE_PLUGINS=ON
+        if: ${{ success() }}
+
+      - name: (CMake) Look at CMakeCache.txt if error
+        run: cat build/CMakeCache.txt
+        if: ${{ failure() }}
+
+      - name: (CMake) Print Summary
+        run: cat build/libnetcdf.settings
+
+      - name: (CMake) Build All
+        env:
+          MAKE: "/usr/bin/make"
+          CXX: "/usr/bin/g++"
+        run: cmake --build build -j$(nproc)
+        if: ${{ success() }}
+
+      - name: (CMake) Run Tests
+        run: PATH=$PWD/build:$PATH ctest --test-dir build
+        if: ${{ success() }}
+
+      - name: (CMake) Verbose output of CTest failures
+        run: >-
+          PATH=$PWD/build:$PATH ctest --test-dir build --output-on-failure -j$(nproc) --rerun-failed -VV
+        if: ${{ failure() }}

CMakeLists.txt

@@ -38,9 +38,7 @@ set(netCDF_LIB_VERSION 22)
 set(netCDF_SO_VERSION 22)
 
 #Add custom CMake Module
-
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/;${PROJECT_SOURCE_DIR}/cmake"
-  CACHE INTERNAL "Location of our custom CMake modules.")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${PROJECT_SOURCE_DIR}/cmake")
 
 set(PACKAGE "netCDF" CACHE STRING "")
 

RELEASE_NOTES.md

@@ -7,8 +7,9 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.9.3 - TBD
 
+### Release Candidate 1 - July 2024
 
-### Release Candidate 1 - June 2024
+* Convert NCZarr V2 to store all netcdf-4 specific info as attributes. This improves interoperability with other Zarr implementations by no longer using non-standard keys. The price to be paid is that lazy attribute reading cannot be supported. See [Github #2836](https://github.com/Unidata/netcdf-c/issues/2936) for more information.
 
 * Cleanup the option code for NETCDF_ENABLE_SET_LOG_LEVEL\[_FUNC\] See [Github #2931](https://github.com/Unidata/netcdf-c/issues/2931) for more information.
 * Fix duplicate definition when using aws-sdk-cpp. See [Github #2928](https://github.com/Unidata/netcdf-c/issues/2928) for more information.