diff options
| author | David Faure <faure@kde.org> | 2019-03-05 11:46:54 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2019-03-05 15:40:26 +0100 |
| commit | bb8c053d9d41df3946b064384cbaa3ecb12f231f (patch) | |
| tree | 420073b8aa7d5a5e122d8a5eb5c65778f40390a5 /modules/ECMGeneratePkgConfigFile.cmake | |
| parent | 8999b7bd6f6d1505c1b59b48432a3cfa4a90a2f8 (diff) | |
| download | extra-cmake-modules-bb8c053d9d41df3946b064384cbaa3ecb12f231f.tar.gz extra-cmake-modules-bb8c053d9d41df3946b064384cbaa3ecb12f231f.tar.bz2 | |
ECMGeneratePkgConfigFile: make all vars dependent on ${prefix}
Summary:
Note that the first test had a comment "without optional arguments"
so I removed the INCLUDE_INSTALL_DIR variable to test what happens by
default. The other tests still pass an absolute path there (which is
unusual in practice, and breaks the idea of using ${prefix}).
Test Plan: `ctest -R PkgConfig` passes
Reviewers: kossebau, apol, cgiboudeaux
Reviewed By: apol
Subscribers: kde-frameworks-devel, kde-buildsystem, fazevedo
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D19538
Diffstat (limited to 'modules/ECMGeneratePkgConfigFile.cmake')
| -rw-r--r-- | modules/ECMGeneratePkgConfigFile.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/ECMGeneratePkgConfigFile.cmake b/modules/ECMGeneratePkgConfigFile.cmake index 51c21198..6e94663e 100644 --- a/modules/ECMGeneratePkgConfigFile.cmake +++ b/modules/ECMGeneratePkgConfigFile.cmake @@ -158,12 +158,12 @@ function(ECM_GENERATE_PKGCONFIG_FILE) if(IS_ABSOLUTE "${EGPF_INCLUDE_INSTALL_DIR}") set(PKGCONFIG_TARGET_INCLUDES "${EGPF_INCLUDE_INSTALL_DIR}") else() - set(PKGCONFIG_TARGET_INCLUDES "${CMAKE_INSTALL_PREFIX}/${EGPF_INCLUDE_INSTALL_DIR}") + set(PKGCONFIG_TARGET_INCLUDES "\${prefix}/${EGPF_INCLUDE_INSTALL_DIR}") endif() if(IS_ABSOLUTE "${EGPF_LIB_INSTALL_DIR}") set(PKGCONFIG_TARGET_LIBS "${EGPF_LIB_INSTALL_DIR}") else() - set(PKGCONFIG_TARGET_LIBS "${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}") + set(PKGCONFIG_TARGET_LIBS "\${prefix}/${EGPF_LIB_INSTALL_DIR}") endif() set(PKGCONFIG_TARGET_DESCRIPTION "${EGPF_DESCRIPTION}") set(PKGCONFIG_TARGET_DEFINES "") @@ -179,14 +179,14 @@ function(ECM_GENERATE_PKGCONFIG_FILE) file(WRITE ${PKGCONFIG_FILENAME} " prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} +exec_prefix=\${prefix} +libdir=\${prefix}/${EGPF_LIB_INSTALL_DIR} includedir=${PKGCONFIG_TARGET_INCLUDES} Name: ${PKGCONFIG_TARGET_LIBNAME} Description: ${PKGCONFIG_TARGET_DESCRIPTION} Version: ${PROJECT_VERSION} -Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME} +Libs: -L\${prefix}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME} Cflags: -I${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES} Requires: ${PKGCONFIG_TARGET_DEPS} " |