link szip if statically linked, even though we don't use szip

This is because if system libhdf5 linked szip, our builds will fail
with missing szip symbols unless we also link szip. This is despite
h5fortran not using szip.

Author: scivision

CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 project(h5fortran
   LANGUAGES C Fortran
-  VERSION 3.0.2
+  VERSION 3.0.3
   DESCRIPTION "thin, light object-oriented HDF5 Fortran interface"
   HOMEPAGE_URL https://github.com/geospace-code/h5fortran)
 enable_testing()

cmake/hdf5.cmake

@@ -24,18 +24,20 @@ endif()
 find_path(HDF5_MODULE_DIR NAMES hdf5.mod HINTS ${HDF5_INCLUDE_DIRS} PATH_SUFFIXES static)
 if(HDF5_MODULE_DIR)
   list(APPEND HDF5_INCLUDE_DIRS ${HDF5_MODULE_DIR})
-  # set(SZIP_ROOT "${HDF5_MODULE_DIR}/..;${HDF5_MODULE_DIR}/../..")
+  set(SZIP_ROOT "${HDF5_MODULE_DIR}/..;${HDF5_MODULE_DIR}/../..")
   set(ZLIB_ROOT "${HDF5_MODULE_DIR}/..;${HDF5_MODULE_DIR}/../..")
 endif()
 list(REMOVE_DUPLICATES HDF5_INCLUDE_DIRS)
 
 # in case the compiler wrapper didn't work
 set(HDF5_LIBRARIES ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_Fortran_LIBRARIES} ${HDF5_LIBRARIES})
 
-# find_package(SZIP)
-# if(SZIP_FOUND)
-#   list(APPEND HDF5_LIBRARIES SZIP::SZIP)
-# endif()
+# Szip even though not directly used because if system static links libhdf5 with szip,
+# our builds will fail if we don't also link szip.
+find_package(SZIP)
+if(SZIP_FOUND)
+  list(APPEND HDF5_LIBRARIES SZIP::SZIP)
+endif()
 
 find_package(ZLIB)
 if(ZLIB_FOUND)
@@ -54,8 +56,9 @@ if(UNIX)
   list(APPEND HDF5_LIBRARIES m)
 endif()
 
-if(WIN32 AND MSVC)
+if(MSVC)
   # this stanza must be BEFORE if(DEFINED HDF5OK)
+  # this is specifically for Intel compiler with HDF5 1.10 or 1.12 binary install.
   if(NOT DEFINED HDF5_ROOT AND DEFINED ENV{HDF5_ROOT})
     file(TO_CMAKE_PATH "$ENV{HDF5_ROOT}" HDF5_ROOT)
   endif()

meson.build

@@ -1,6 +1,6 @@
 project('h5fortran', 'fortran',
   meson_version : '>=0.52.0',
-  version : '3.0.2',
+  version : '3.0.3',
   default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
 
 subdir('meson')