cmake: find hdf5.mod that may be missing from include_dirs

 find auxiliary libraries needed by hdf5 when compiler wrapper is not working

Author: scivision

CMakeLists.txt

@@ -3,8 +3,8 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug or Release")
 endif()
 project(h5fortran
-  LANGUAGES Fortran
-  VERSION 2.5.3
+  LANGUAGES C Fortran
+  VERSION 2.5.4
   DESCRIPTION "thin, light, easy HDF5 Fortran interface"
   HOMEPAGE_URL https://github.com/scivision/h5fortran)
 enable_testing()

cmake/Modules/FindSZIP.cmake

@@ -0,0 +1,52 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+
+FindSZIP
+---------
+
+by Michael Hirsch, Ph.D. www.scivision.dev
+
+Finds SZIP developed by HDF Group & used by HDF5.
+
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+``SZIP_FOUND``
+  SZIP libraries were found
+``SZIP_INCLUDE_DIRS``
+  SZIP include directory
+``SZIP_LIBRARIES``
+  SZIP library files
+
+
+Targets
+^^^^^^^
+
+``SZIP::SZIP``
+  SZIP Imported Target
+#]=======================================================================]
+
+find_library(SZIP_LIBRARY NAMES szip sz)
+
+find_path(SZIP_INCLUDE_DIR NAMES szlib.h)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SZIP
+  REQUIRED_VARS SZIP_LIBRARY SZIP_INCLUDE_DIR)
+
+if(SZIP_FOUND)
+  set(SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR})
+  set(SZIP_LIBRARIES ${SZIP_LIBRARY})
+
+  if(NOT TARGET SZIP::SZIP)
+    add_library(SZIP::SZIP UNKNOWN IMPORTED)
+    set_target_properties(SZIP::SZIP PROPERTIES
+      IMPORTED_LOCATION ${SZIP_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${SZIP_INCLUDE_DIR})
+  endif()
+endif()
+
+mark_as_advanced(SZIP_LIBRARY SZIP_INCLUDE_DIR)

cmake/hdf5.cmake

@@ -1,28 +1,51 @@
 # don't enclose this all in "if(NOT DEFINED HDF5OK)" because CMake intermittantly doesn't cache needed HDF5 variables.
 
 set(HDF5_USE_STATIC_LIBRARIES true)
-
 # Intel HDF5 for Windows has some real issues from the factory, this makes it work:
 if(WIN32 AND CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
   set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE true)
-  set(HDF5_SEARCH_WRAPPER false)
   set(HDF5_USE_STATIC_LIBRARIES false)
 endif()
 
 find_package(HDF5 REQUIRED COMPONENTS Fortran HL)
-if(MINGW)
-  set(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS}/static)
+list(APPEND HDF5_INCLUDE_DIRS ${HDF5_Fortran_INCLUDE_DIRS})
+# this is because HDF5's CONFIG files are incorrect (at least for 1.10.5)
+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(ZLIB_ROOT ${SZIP_ROOT})
 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})
-list(APPEND HDF5_INCLUDE_DIRS ${HDF5_Fortran_INCLUDE_DIRS})
+
+find_package(SZIP)
+if(SZIP_FOUND)
+  list(APPEND HDF5_LIBRARIES SZIP::SZIP)
+endif()
+find_package(ZLIB)
+if(ZLIB_FOUND)
+  list(APPEND HDF5_LIBRARIES ZLIB::ZLIB)
+endif()
+set(THREADS_PREFER_PTHREAD_FLAG true)
+find_package(Threads)
+if(Threads_FOUND)
+  list(APPEND HDF5_LIBRARIES Threads::Threads)
+endif()
+list(APPEND HDF5_LIBRARIES ${CMAKE_DL_LIBS})
+if(UNIX)
+  list(APPEND HDF5_LIBRARIES m)
+endif()
 
 if(DEFINED HDF5OK)
   return()
 endif()
 
 message(STATUS "HDF5 include: ${HDF5_INCLUDE_DIRS}")
 message(STATUS "HDF5 library: ${HDF5_LIBRARIES}")
+# we don't use these because they may come from a broken compiler wrapper
 if(HDF5_Fortran_COMPILER_EXECUTABLE)
   message(STATUS "HDF5 Fortran compiler: ${HDF5_Fortran_COMPILER_EXECUTABLE}")
 endif()

meson.build

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

src/CMakeLists.txt

@@ -7,7 +7,6 @@ target_include_directories(h5fortran PRIVATE ${HDF5_INCLUDE_DIRS}
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
   $<INSTALL_INTERFACE:include>)
 target_link_libraries(h5fortran PRIVATE ${HDF5_LIBRARIES})
-target_compile_options(h5fortran PRIVATE ${HDF5_Fortran_DEFINITIONS})
 set_target_properties(h5fortran PROPERTIES
   Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include
   ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}