diff options
| author | Weng Xuetian <wengxt@gmail.com> | 2017-03-11 10:09:30 -0800 |
|---|---|---|
| committer | Weng Xuetian <wengxt@gmail.com> | 2017-03-11 16:33:50 -0800 |
| commit | 3980f36db0184e0855ff5673496c6b63311c23cf (patch) | |
| tree | f8e5cc41863aa263de93e2d6af382f8d1b2a5def | |
| parent | 72e58ff24b7aa195f8902562fdbda25502447476 (diff) | |
| download | extra-cmake-modules-3980f36db0184e0855ff5673496c6b63311c23cf.tar.gz extra-cmake-modules-3980f36db0184e0855ff5673496c6b63311c23cf.tar.bz2 | |
Fix ecm_generate_pkgconfig_file compatibility with new cmake
Summary:
CMP0053 specifies that:
- Expansion of ``@VAR@`` reference syntax defined by the
``configure_file()`` and ``string(CONFIGURE)``
commands is no longer performed in other contexts.
replace it with the $ variable syntax.
Test Plan: manual
Reviewers: #frameworks, dfaure
Reviewed By: dfaure
Subscribers: #build_system
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D5017
| -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 9e3a725e..66c57cd9 100644 --- a/modules/ECMGeneratePkgConfigFile.cmake +++ b/modules/ECMGeneratePkgConfigFile.cmake @@ -160,11 +160,11 @@ function(ECM_GENERATE_PKGCONFIG_FILE) file(WRITE ${PKGCONFIG_FILENAME} " -Name: @PKGCONFIG_TARGET_LIBNAME@ -Version: @PROJECT_VERSION@ -Libs: -L@CMAKE_INSTALL_PREFIX@/@EGPF_LIB_INSTALL_DIR@ -l@PKGCONFIG_TARGET_LIBNAME@ -Cflags: @PKGCONFIG_TARGET_INCLUDES@ @PKGCONFIG_TARGET_DEFINES@ -Requires: @PKGCONFIG_TARGET_DEPS@ +Name: ${PKGCONFIG_TARGET_LIBNAME} +Version: ${PROJECT_VERSION} +Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME} +Cflags: ${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES} +Requires: ${PKGCONFIG_TARGET_DEPS} " ) |