diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-02-17 22:18:05 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-17 22:18:05 (GMT) |
commit | 7a199519842f1f70f80d31a2f6be9ac6efc2e57a (patch) | |
tree | 2da6ca2d74856c28bea13a5f3680562b25361093 /src | |
parent | 63fa76cc846e88630f50393328d332b15278448a (diff) | |
download | hdf5-7a199519842f1f70f80d31a2f6be9ac6efc2e57a.zip hdf5-7a199519842f1f70f80d31a2f6be9ac6efc2e57a.tar.gz hdf5-7a199519842f1f70f80d31a2f6be9ac6efc2e57a.tar.bz2 |
1.10 Merge Merge CMake generated pkg-config file is incorrect #2259 (#2479)
* Merge Merge CMake generated pkg-config file is incorrect #2259
* Fix spacing
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index faa7964..aa03530 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1255,20 +1255,30 @@ 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}") +set (PKGCONFIG_LIBNAME "${HDF5_LIB_CORENAME}") +if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer") + set (PKGCONFIG_LIBNAME "${PKGCONFIG_LIBNAME}${CMAKE_DEBUG_POSTFIX}") +endif () + +foreach (libs ${LINK_LIBS}) + set (_PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE} -l${libs}") +endforeach () -foreach (libs ${LINK_LIBS} ${LINK_COMP_LIBS}) +# The settings for the compression libs depends on if they have pkconfig support +# Assuming they don't +foreach (libs ${LINK_COMP_LIBS}) +# set (_PKG_CONFIG_REQUIRES_PRIVATE "${_PKG_CONFIG_REQUIRES_PRIVATE} -l${libs}") set (_PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE} -l${libs}") endforeach () if (NOT ONLY_SHARED_LIBS) - set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}") + set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${PKGCONFIG_LIBNAME}") endif () if (BUILD_SHARED_LIBS) - set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}") + set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${PKGCONFIG_LIBNAME}") endif () set (_PKG_CONFIG_REQUIRES) -set (_PKG_CONFIG_REQUIRES_PRIVATE) configure_file ( ${HDF_CONFIG_DIR}/libhdf5.pc.in |