diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-07-26 16:02:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 16:02:40 (GMT) |
| commit | 06363958513ad26b2c21cd99858183c97e6d223a (patch) | |
| tree | 941a6beb2c1372f1955562c6712fd91c22be834b /config | |
| parent | b0240030f5dd1c3da65fd66b76fcdfe13604489c (diff) | |
| download | hdf5-06363958513ad26b2c21cd99858183c97e6d223a.zip hdf5-06363958513ad26b2c21cd99858183c97e6d223a.tar.gz hdf5-06363958513ad26b2c21cd99858183c97e6d223a.tar.bz2 | |
Implement improved CMake fortran module folder from GH#1411 (#1922)
* Implement improved CMake fortran module folder from GH#1411
* Update docs
* Fix whitespace
* Fix name case
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 5 | ||||
| -rw-r--r-- | config/libhdf5.fpc.in | 16 |
2 files changed, 20 insertions, 1 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 260fd55..6f517bd 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -344,6 +344,9 @@ macro (HDF_DIR_PATHS package_prefix) if (NOT ${package_prefix}_INSTALL_INCLUDE_DIR) set (${package_prefix}_INSTALL_INCLUDE_DIR include) endif () + if (NOT ${package_prefix}_INSTALL_MODULE_DIR) + set (${package_prefix}_INSTALL_MODULE_DIR mod) + endif () if (NOT ${package_prefix}_INSTALL_DATA_DIR) if (NOT MSVC) if (APPLE) @@ -412,7 +415,7 @@ macro (HDF_DIR_PATHS package_prefix) ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." ) set (CMAKE_Fortran_MODULE_DIRECTORY - ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all fortran modules." + ${PROJECT_BINARY_DIR}/mod CACHE PATH "Single Directory for all fortran modules." ) get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if(_isMultiConfig) diff --git a/config/libhdf5.fpc.in b/config/libhdf5.fpc.in new file mode 100644 index 0000000..c28c2f9 --- /dev/null +++ b/config/libhdf5.fpc.in @@ -0,0 +1,16 @@ +prefix=@_PKG_CONFIG_PREFIX@ +exec_prefix=@_PKG_CONFIG_EXEC_PREFIX@ +libdir=@_PKG_CONFIG_LIBDIR@ +includedir=@_PKG_CONFIG_INCLUDEDIR@ +moddir=@_PKG_CONFIG_MODULEDIR@ + +Name: @_PKG_CONFIG_LIBNAME@ +Description: HDF5 (Hierarchical Data Format 5) Software Library +Version: @_PKG_CONFIG_VERSION@ + +Cflags: -I${includedir} +Fflags: -I${moddir} +Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@ +Requires: @_PKG_CONFIG_REQUIRES@ +Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@ +Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@ |