cmake: use imported targets (modernize)

Author: scivision

CMakeLists.txt

@@ -2,9 +2,9 @@ cmake_minimum_required (VERSION 3.12)  # 3.12 for Fortran submodule
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug or Release")
 endif()
-project(hdf5iface
+project(h5fortran
   LANGUAGES Fortran
-  VERSION 2.5.0
+  VERSION 2.5.1
   DESCRIPTION "thin, light, easy HDF5 Fortran interface"
   HOMEPAGE_URL https://github.com/scivision/h5fortran)
 enable_testing()
@@ -13,24 +13,32 @@ option(test_shaky "run shaky tests" OFF)
 
 # list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 
-include(cmake/compilers.cmake)
-include(cmake/hdf5.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/hdf5.cmake)
 
-set(CTEST_TEST_TIMEOUT 15)
-# --- install config (before build)
+if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  set(CTEST_TEST_TIMEOUT 15)
+  # --- install config (before build)
 
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  if(WIN32)
-    set(HOME $ENV{USERPROFILE})
-  else()
-    set(HOME $ENV{HOME})
-  endif()
+  if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    if(WIN32)
+      set(HOME $ENV{USERPROFILE})
+    else()
+      set(HOME $ENV{HOME})
+    endif()
 
-  set(CMAKE_INSTALL_PREFIX "${HOME}/.local/h5fortran" CACHE PATH "..." FORCE)
+    set(CMAKE_INSTALL_PREFIX "${HOME}/.local/h5fortran" CACHE PATH "..." FORCE)
+  endif()
 endif()
-
-# -- build
+# --- build
 
 add_subdirectory(src)
 
 add_subdirectory(src/tests)
+
+if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  set(CPACK_GENERATOR ZIP)
+  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+  set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+  include(CPack)
+endif()

README.md

@@ -63,6 +63,8 @@ The library `libh5fortran` is built, link it into your program as usual.
 
 ### Meson
 
+To build h5fortran as a standalone project
+
 ```sh
 meson build
 
@@ -119,10 +121,15 @@ include(FetchContent)
 
 FetchContent_Declare(h5fortran_proj
   GIT_REPOSITORY https://github.com/scivision/h5fortran.git
-  GIT_TAG v2.4.1  # whatever desired version is
+  GIT_TAG master  # whatever desired version is
 )
 
 FetchContent_MakeAvailable(h5fortran_proj)
+
+# ------------------------------------------------------
+# whatever your program is
+add_executable(myProj main.f90)
+target_link_libraries(myProj h5fortran::h5fortran)
 ```
 
 ## Usage

cmake/h5fortranConfig.cmake.in

@@ -0,0 +1,3 @@
+@PACKAGE_INIT@
+
+check_required_components(h5fortran)

cmake/hdf5.cmake

@@ -15,7 +15,6 @@ endif()
 find_package(HDF5 REQUIRED COMPONENTS Fortran HL)
 if(MINGW)
   set(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS}/static)
-  message(${HDF5_INCLUDE_DIRS})
 endif()
 
 set(HDF5_LIBRARIES ${HDF5_Fortran_HL_LIBRARIES} ${HDF5_Fortran_LIBRARIES} ${HDF5_LIBRARIES})

cmake/install.cmake

@@ -0,0 +1,33 @@
+# --- install / packaging
+
+install(TARGETS ${PROJECT_NAME}
+  EXPORT ${PROJECT_NAME}Targets
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  RUNTIME DESTINATION bin
+  INCLUDES DESTINATION include)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include)
+
+
+include(CMakePackageConfigHelpers)
+
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/${PROJECT_NAME}Config.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+  INSTALL_DESTINATION lib)
+
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+  VERSION $${PROJECT_NAME}_VERSION}
+  COMPATIBILITY SameMinorVersion
+)
+
+install(EXPORT ${PROJECT_NAME}Targets
+  FILE ${PROJECT_NAME}Targets.cmake
+  NAMESPACE ${PROJECT_NAME}::
+  DESTINATION lib/cmake/${PROJECT_NAME}
+   )
+
+install(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+  DESTINATION lib/cmake/${PROJECT_NAME})

meson.build

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

src/CMakeLists.txt

@@ -2,16 +2,18 @@ add_library(h5fortran hdf5_interface.f90
   read.f90 reader.f90
   write.f90 writer.f90
   string_utils.f90)
-# need BOTH includes, for some systems!
-target_include_directories(h5fortran PRIVATE ${HDF5_INCLUDE_DIRS})
+target_include_directories(h5fortran PRIVATE ${HDF5_INCLUDE_DIRS}
+  INTERFACE
+  $<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_BINARY_DIR}
-  ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+  Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include
+  ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+add_library(h5fortran::h5fortran ALIAS h5fortran)
 
-install(TARGETS h5fortran
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(FILES ${CMAKE_BINARY_DIR}/h5fortran.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
+if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/install.cmake)
+endif()

src/tests/CMakeLists.txt

@@ -1,25 +1,25 @@
 set(tmpdir ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(test_minimal test_minimal.f90)
-target_link_libraries(test_minimal PRIVATE h5fortran ${HDF5_LIBRARIES})
-target_include_directories(test_minimal PRIVATE ${CMAKE_BINARY_DIR} ${HDF5_INCLUDE_DIRS})
+target_link_libraries(test_minimal PRIVATE h5fortran::h5fortran ${HDF5_LIBRARIES})
+target_include_directories(test_minimal PRIVATE ${HDF5_INCLUDE_DIRS})
 add_test(NAME h5fortran:minimal COMMAND $<TARGET_FILE:test_minimal> ${tmpdir})
 if(WIN32 AND HDF5_ROOT)
   set_tests_properties(h5fortran:minimal PROPERTIES ENVIRONMENT "PATH=${HDF5_ROOT}/bin;$ENV{PATH}")
 endif()
 
 add_executable(test_errors test_error.f90)
-target_link_libraries(test_errors PRIVATE h5fortran ${HDF5_LIBRARIES})
-target_include_directories(test_errors PRIVATE ${CMAKE_BINARY_DIR} ${HDF5_INCLUDE_DIRS})
+target_link_libraries(test_errors PRIVATE h5fortran::h5fortran ${HDF5_LIBRARIES})
+target_include_directories(test_errors PRIVATE ${HDF5_INCLUDE_DIRS})
 add_test(NAME h5fortran:ErrorCheck COMMAND $<TARGET_FILE:test_errors> ${tmpdir})
 set_tests_properties(h5fortran:ErrorCheck PROPERTIES SKIP_RETURN_CODE 77)
 if(WIN32 AND HDF5_ROOT)
   set_tests_properties(h5fortran:ErrorCheck PROPERTIES ENVIRONMENT "PATH=${HDF5_ROOT}/bin;$ENV{PATH}")
 endif()
 
 add_executable(testh5 test_hdf5_ifc.f90)
-target_link_libraries(testh5 PRIVATE h5fortran ${HDF5_LIBRARIES})
-target_include_directories(testh5 PRIVATE ${CMAKE_BINARY_DIR} ${HDF5_INCLUDE_DIRS})
+target_link_libraries(testh5 PRIVATE h5fortran::h5fortran ${HDF5_LIBRARIES})
+target_include_directories(testh5 PRIVATE ${HDF5_INCLUDE_DIRS})
 if(${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU)
   target_compile_options(testh5 PRIVATE -Wno-compare-reals)
 endif()
@@ -32,8 +32,8 @@ if(WIN32 AND HDF5_ROOT)
 endif()
 
 add_executable(test_deflate test_deflate.f90)
-target_link_libraries(test_deflate PRIVATE h5fortran ${HDF5_LIBRARIES})
-target_include_directories(test_deflate PRIVATE ${CMAKE_BINARY_DIR} ${HDF5_INCLUDE_DIRS})
+target_link_libraries(test_deflate PRIVATE h5fortran::h5fortran ${HDF5_LIBRARIES})
+target_include_directories(test_deflate PRIVATE ${HDF5_INCLUDE_DIRS})
 add_test(NAME h5fortran:deflate COMMAND $<TARGET_FILE:test_deflate> ${tmpdir})
 set_tests_properties(h5fortran:deflate PROPERTIES SKIP_RETURN_CODE 77)
 if(WIN32 AND HDF5_ROOT)
@@ -45,8 +45,8 @@ set(testfile ${tmpdir}/p5.h5)
 
 # ====
 add_executable(test_shape test_shape.f90)
-target_link_libraries(test_shape PRIVATE h5fortran ${HDF5_LIBRARIES})
-target_include_directories(test_shape PRIVATE ${CMAKE_BINARY_DIR} ${HDF5_INCLUDE_DIRS})
+target_link_libraries(test_shape PRIVATE h5fortran::h5fortran ${HDF5_LIBRARIES})
+target_include_directories(test_shape PRIVATE ${HDF5_INCLUDE_DIRS})
 
 add_test(NAME h5fortran:ShapeCheck COMMAND $<TARGET_FILE:test_shape> ${testfile} /group69/flux_node)
 set_tests_properties(h5fortran:ShapeCheck PROPERTIES