cmake: modernize like h5fortran

Author: scivision

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.11...3.25)
+cmake_minimum_required(VERSION 3.14...3.28)
 
 get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(NOT is_multi_config AND NOT (CMAKE_BUILD_TYPE OR DEFINED ENV{CMAKE_BUILD_TYPE}))
@@ -23,7 +23,18 @@ if(${PROJECT_NAME}_BUILD_TESTING)
   enable_language(CXX)
 endif()
 
-include(cmake/options.cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+# --- avoid Anaconda libraries
+if(DEFINED ENV{CONDA_PREFIX})
+  list(APPEND CMAKE_IGNORE_PREFIX_PATH $ENV{CONDA_PREFIX})
+  list(APPEND CMAKE_IGNORE_PATH $ENV{CONDA_PREFIX}/bin)
+  # need CMAKE_IGNORE_PATH for CMake < 3.23
+  # and to ensure system env var PATH doesn't interfere
+  # despite CMAKE_IGNORE_PREFIX_PATH
+endif()
+
+include(options.cmake)
 include(cmake/compilers.cmake)
 
 # if HDF5-MPI, ensure all the pieces are working together at configure time.
@@ -83,14 +94,9 @@ set_property(TARGET h5fortran PROPERTY VERSION ${PROJECT_VERSION})
 add_library(h5fortran::h5fortran INTERFACE IMPORTED GLOBAL)
 target_link_libraries(h5fortran::h5fortran INTERFACE h5fortran)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/h5fortran.mod DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/h5fortran.mod TYPE INCLUDE)
 
-install(TARGETS h5fortran EXPORT ${PROJECT_NAME}-targets
-LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
+install(TARGETS h5fortran EXPORT ${PROJECT_NAME}-targets)
 
 add_subdirectory(src)
 

cmake/FindHDF5.cmake

@@ -118,6 +118,7 @@ NAMES H5pubconf.h H5pubconf-64.h
 HINTS ${HDF5_C_INCLUDE_DIR}
 NO_DEFAULT_PATH
 )
+message(VERBOSE "HDF5 config: ${h5_conf}")
 
 if(NOT h5_conf)
   set(HDF5_C_FOUND false)
@@ -145,23 +146,19 @@ endif()
 # get version
 # from CMake/Modules/FindHDF5.cmake
 file(STRINGS ${h5_conf} _def
-REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+" )
-if("${_def}" MATCHES
-"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)(-patch([0-9]+))?\"" )
-  set(HDF5_VERSION "${CMAKE_MATCH_1}" )
-  if(CMAKE_MATCH_3)
-    set(HDF5_VERSION ${HDF5_VERSION}.${CMAKE_MATCH_3})
+REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+"
+)
+message(DEBUG "HDF5 version define: ${_def}")
+
+if("${_def}" MATCHES "H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)")
+  set(HDF5_VERSION "${CMAKE_MATCH_1}")
   endif()
-endif()
+message(DEBUG "HDF5 version match 0, 1: ${CMAKE_MATCH_0}   ${CMAKE_MATCH_1}")
 
 # avoid picking up incompatible zlib over the desired zlib
-if(CMAKE_VERSION VERSION_LESS 3.20)
-  get_filename_component(zlib_dir ${HDF5_C_INCLUDE_DIR} DIRECTORY)
-else()
-  cmake_path(GET HDF5_C_INCLUDE_DIR PARENT_PATH zlib_dir)
-endif()
 if(NOT ZLIB_ROOT)
-  set(ZLIB_ROOT "${HDF5_ROOT};${zlib_dir}")
+  get_filename_component(ZLIB_ROOT ${HDF5_C_INCLUDE_DIR} DIRECTORY)
+  list(APPEND ZLIB_ROOT ${HDF5_ROOT})
 endif()
 
 
@@ -504,13 +501,15 @@ if(HDF5_ROOT)
   NO_DEFAULT_PATH
   HINTS ${HDF5_ROOT}
   PATH_SUFFIXES ${hdf5_binsuf}
+   DOC "HDF5 Fortran compiler script"
   )
 else()
   find_program(HDF5_Fortran_COMPILER_EXECUTABLE
   NAMES ${wrapper_names}
   NAMES_PER_DIR
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 Fortran compiler script"
   )
 endif()
 
@@ -559,13 +558,15 @@ if(HDF5_ROOT)
   NO_DEFAULT_PATH
   HINTS ${HDF5_ROOT}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 C++ compiler script"
   )
 else()
   find_program(HDF5_CXX_COMPILER_EXECUTABLE
   NAMES ${wrapper_names}
   NAMES_PER_DIR
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 C++ compiler script"
   )
 endif()
 
@@ -608,13 +609,15 @@ if(HDF5_ROOT)
   NO_DEFAULT_PATH
   HINTS ${HDF5_ROOT}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 C compiler script"
   )
 else()
   find_program(HDF5_C_COMPILER_EXECUTABLE
   NAMES ${wrapper_names}
   NAMES_PER_DIR
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 C compiler script"
   )
 endif()
 
@@ -782,15 +785,6 @@ if(NOT HDF5_ROOT)
   endif()
 endif()
 
-# Conda causes numerous problems with finding HDF5, so exclude from search
-if(DEFINED ENV{CONDA_PREFIX})
-  set(h5_ignore_path
-    $ENV{CONDA_PREFIX}/bin $ENV{CONDA_PREFIX}/lib $ENV{CONDA_PREFIX}/include
-    $ENV{CONDA_PREFIX}/Library/bin $ENV{CONDA_PREFIX}/Library/lib $ENV{CONDA_PREFIX}/Library/include
-  )
-  list(APPEND CMAKE_IGNORE_PATH ${h5_ignore_path})
-endif()
-
 # --- library suffixes
 
 set(hdf5_lsuf lib hdf5/lib)  # need explicit "lib" for self-built HDF5
@@ -877,11 +871,6 @@ check_hdf5_link()
 set(CMAKE_REQUIRED_LIBRARIES)
 set(CMAKE_REQUIRED_INCLUDES)
 
-# pop off ignored paths so rest of script can find Python
-if(DEFINED CMAKE_IGNORE_PATH)
-  list(REMOVE_ITEM CMAKE_IGNORE_PATH "${h5_ignore_path}")
-endif()
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HDF5
 REQUIRED_VARS HDF5_C_LIBRARIES HDF5_links

cmake/hdf5.cmake

@@ -17,7 +17,7 @@ set(HDF5_LIBRARIES)
 foreach(_name hdf5_hl_fortran hdf5_hl_f90cstub hdf5_fortran hdf5_f90cstub hdf5_hl hdf5)
   if(BUILD_SHARED_LIBS)
     if(WIN32)
-      list(APPEND HDF5_LIBRARIES ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/lib${_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
+      list(APPEND HDF5_LIBRARIES ${CMAKE_INSTALL_FULL_BINDIR}/lib${_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
     else()
       list(APPEND HDF5_LIBRARIES ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/lib${_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
     endif()
@@ -26,7 +26,7 @@ foreach(_name hdf5_hl_fortran hdf5_hl_f90cstub hdf5_fortran hdf5_f90cstub hdf5_h
   endif()
 endforeach()
 
-set(HDF5_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+set(HDF5_INCLUDE_DIRS ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 
 # --- Zlib
 if(NOT TARGET ZLIB::ZLIB)

cmake/options.cmake renamed to options.cmake

@@ -8,7 +8,7 @@ option(tidy "Run clang-tidy on the code")
 
 option(hdf5_parallel "use HDF5-MPI layer" true)
 
-set(CMAKE_TLS_VERIFY true)
+option(CMAKE_TLS_VERIFY "Verify TLS certificates" true)
 
 include(GNUInstallDirs)
 
@@ -18,19 +18,7 @@ if(BUILD_SHARED_LIBS AND MSVC)
     cmake -DBUILD_SHARED_LIBS=off")
 endif()
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-
-# Rpath options necessary for shared library install to work correctly in user projects
-set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
-
 # Necessary for shared library with Visual Studio / Windows oneAPI
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS true)
 
-# allow CMAKE_PREFIX_PATH with ~ expand
-if(CMAKE_PREFIX_PATH)
-  get_filename_component(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ABSOLUTE)
-endif()
-
 file(GENERATE OUTPUT .gitignore CONTENT "*")