Merge pull request #1304 from mathstuf/szip-windows-library-name

szip: the library name is `szip` on Windows
Unidata · Dec 31, 2023 · 7b4f881 · 7b4f881
2 parents ae15b6d + 10c9693
commit 7b4f881
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Changelog b/Changelog
@@ -3,8 +3,10 @@
  * add support for complex numbers via `auto_complex` keyword to `Dataset` (PR #1295)
  * fix for deprecated Cython `DEF` and `IF` statements using compatibility header
    with shims for unavailable functionality (PR #1277)
+ * use `szip` as the library name on Windows (PR #1304)
  * add support for MS-MPI `MPI_Message` detection (PR #1305)
 
+
  version 1.6.5 (tag v1.6.5rel)
 ===============================
  * fix for issue #1271 (mask ignored if bool MA assinged to uint8 var)

diff --git a/setup.py b/setup.py
@@ -315,7 +315,11 @@ def _populate_hdf5_info(dirstosearch, inc_dirs, libs, lib_dirs):
     if szip_incdir is None and szip_dir is not None:
         szip_incdir = os.path.join(szip_dir, 'include')
     if szip_incdir is not None and szip_libdir is not None:
-        libs.append('sz')
+        if sys.platform == 'win32':
+            libs.append('szip')
+        else:
+            libs.append('sz')
+
         lib_dirs.append(szip_libdir)
         inc_dirs.append(szip_incdir)
     # add hdf4 to link if desired.