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 /tests | |
| 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 'tests')
4 files changed, 14 insertions, 12 deletions
diff --git a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc index 3e05c11e..cdc3b119 100644 --- a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc +++ b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc @@ -1,11 +1,12 @@ + prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/KCoreAddons +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include/KF5CoreAddons Name: KF5CoreAddons Description: KF5CoreAddons test Version: 5.43 -Libs: -L/usr/lib -lKF5CoreAddons -Cflags: -I/usr/KCoreAddons +Libs: -L${prefix}/lib -lKF5CoreAddons +Cflags: -I${prefix}/include/KF5CoreAddons Requires: Qt5Core diff --git a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc index d4f473d4..816ee5af 100644 --- a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc +++ b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc @@ -1,11 +1,12 @@ + prefix=/usr -exec_prefix=/usr -libdir=/usr/lib +exec_prefix=${prefix} +libdir=${prefix}/lib includedir=/usr/KCoreAddons Name: KF5CoreAddons2 Description: Addons to QtCore Version: 5.43 -Libs: -L/usr/lib -lKF5CoreAddons2 +Libs: -L${prefix}/lib -lKF5CoreAddons2 Cflags: -I/usr/KCoreAddons Requires: Qt5Core diff --git a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc index 16c81d7a..bd3886dc 100644 --- a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc +++ b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc @@ -1,11 +1,12 @@ + prefix=/usr -exec_prefix=/usr -libdir=/usr/lib +exec_prefix=${prefix} +libdir=${prefix}/lib includedir=/usr/KCoreAddons Name: KF5CoreAddons3 Description: KF5CoreAddons3 library. Version: 5.43 -Libs: -L/usr/lib -lKF5CoreAddons3 +Libs: -L${prefix}/lib -lKF5CoreAddons3 Cflags: -I/usr/KCoreAddons Requires: Qt5Core diff --git a/tests/ECMGeneratePkgConfigFile/run_test.cmake.config b/tests/ECMGeneratePkgConfigFile/run_test.cmake.config index 45b3d26d..f799b202 100644 --- a/tests/ECMGeneratePkgConfigFile/run_test.cmake.config +++ b/tests/ECMGeneratePkgConfigFile/run_test.cmake.config @@ -51,7 +51,6 @@ set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons.pc") ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons DESCRIPTION "KF5CoreAddons test" DEPS Qt5Core - INCLUDE_INSTALL_DIR /usr/KCoreAddons FILENAME_VAR OutputFile) compare_files(GENERATED ${OutputFile} |