diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-10-25 15:50:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 15:50:43 (GMT) |
| commit | ea902f9acefec5303cb3e3527d4472e97956a122 (patch) | |
| tree | 80be2bb4a7e373a81d8bde511e361d3cd8bfcdca /hl | |
| parent | f98c93ab193bd7258f165de8c61a1809087975ee (diff) | |
| download | hdf5-ea902f9acefec5303cb3e3527d4472e97956a122.zip hdf5-ea902f9acefec5303cb3e3527d4472e97956a122.tar.gz hdf5-ea902f9acefec5303cb3e3527d4472e97956a122.tar.bz2 | |
Implement option for using CMake GNUInstallDirs (#2175)
* Implement option for using CMake GNUInstallDirs
* Add release notes
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | hl/src/CMakeLists.txt | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index 61c8d7b..c411796 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -91,8 +91,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_HL_CPP_LIB_CORENAME}") set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 074a36c..c69b3bb 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -324,9 +324,9 @@ 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_MODULEDIR \${prefix}/mod) +set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${HDF5_INSTALL_LIB_DIR}) +set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR}) +set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR}) set (_PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_CORENAME}") set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index f88aa6c..0ba33cd 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -123,8 +123,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_HL_LIB_CORENAME}") set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") |