Skip to content

Commit bf843c5

Browse files
authored
Fix Fortran pkconfig to indicate full path of modules (HDFGroup#4593)
1 parent bbdebee commit bf843c5

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

fortran/src/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,14 @@ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
583583
set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
584584
set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${HDF5_INSTALL_LIB_DIR})
585585
set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR})
586-
set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR})
586+
if (BUILD_SHARED_LIBS)
587+
set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR}/shared)
588+
else ()
589+
set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR}/static)
590+
endif ()
591+
if (NOT HDF5_INSTALL_MOD_FORTRAN MATCHES "NO")
592+
set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR})
593+
endif ()
587594
set (_PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_NAME}")
588595
set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
589596
set (PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_NAME}")

hl/fortran/src/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,14 @@ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
322322
set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
323323
set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${HDF5_INSTALL_LIB_DIR})
324324
set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR})
325-
set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR})
325+
if (BUILD_SHARED_LIBS)
326+
set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR}/shared)
327+
else ()
328+
set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_MODULE_DIR}/static)
329+
endif ()
330+
if (NOT HDF5_INSTALL_MOD_FORTRAN MATCHES "NO")
331+
set (_PKG_CONFIG_MODULEDIR \${prefix}/${HDF5_INSTALL_INCLUDE_DIR})
332+
endif ()
326333
set (_PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_NAME}")
327334
set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
328335
set (PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_NAME}")

0 commit comments

Comments
 (0)