diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-11-04 15:37:17 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-04 15:37:17 (GMT) |
commit | 52854566ecad891ee60458777932539d3edab6e0 (patch) | |
tree | acf73fd6f48220b972e0c53ecccb18bee072dff5 /src | |
parent | 7a1885451213244da0b244338435830fc4dd6ea1 (diff) | |
download | hdf5-52854566ecad891ee60458777932539d3edab6e0.zip hdf5-52854566ecad891ee60458777932539d3edab6e0.tar.gz hdf5-52854566ecad891ee60458777932539d3edab6e0.tar.bz2 |
1.12 Merge HDFGroup#2175 Implement option for using CMake GNUInstallDirs (#2221)
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/H5Dmodule.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a9802c1..c6294c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1288,8 +1288,8 @@ endif () #----------------------------------------------------------------------------- set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) set (_PKG_CONFIG_EXEC_PREFIX \${prefix}) -set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib) -set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include) +set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${HDF5_INSTALL_LIB_DIR}) +set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR}) set (_PKG_CONFIG_LIBNAME "${HDF5_LIB_CORENAME}") set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") diff --git a/src/H5Dmodule.h b/src/H5Dmodule.h index 4ad3709..00751a9 100644 --- a/src/H5Dmodule.h +++ b/src/H5Dmodule.h @@ -1897,10 +1897,10 @@ allocated if necessary. * <th>byte 0</th> * </tr> * <tr> - * <td>????????</td> - * <td>????SPPP</td> - * <td>PPPPPPPP</td> - * <td>PPPP????</td> + * <td> ???????? </td> + * <td> ????SPPP </td> + * <td> PPPPPPPP </td> + * <td> PPPP???? </td> * </tr> * <tr> * <td colspan="4"> |