Differential D29274

ECMGeneratePriFile: make the pri files relocatable
ClosedPublic
Actions

Authored by dfaure on Apr 29 2020, 1:19 PM.

Details

Reviewers
vatra
kfunk
apol
vkrause
Commits
R240:856fc410bf53: ECMGeneratePriFile: make the pri files relocatable
Summary

Instead of generating
QT.KArchive.includes = /full/path/include/KF5/KArchive
make it
QT.KArchive.includes = $$PWD/../../include/KF5/KArchive

This makes the whole install prefix relocatable after the fact,
the includes will be found based on where the .pri file ended up.

This is especially useful for Conan support, says Bogdan.

Test Plan

After make install in ECM, cd karchive/examples/helloworld && qmake && make

Diff Detail

Repository
R240 Extra CMake Modules
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 26085
Build 26103: arc lint + arc unit
dfaure created this revision.Apr 29 2020, 1:19 PM
Restricted Application added projects: Frameworks, Build System. · View Herald TranscriptApr 29 2020, 1:19 PM
Restricted Application added subscribers: kde-buildsystem, kde-frameworks-devel. · View Herald Transcript
dfaure requested review of this revision.Apr 29 2020, 1:19 PM
kossebau added a subscriber: kossebau.Apr 29 2020, 1:28 PM

D29096 also wants to touch those entries, for different reasons. You may want to align here.

ablu added a subscriber: ablu.Apr 29 2020, 2:41 PM

My reason is basically the same. Will try this version too.

dfaure updated this revision to Diff 81519.Apr 29 2020, 2:45 PM

Fix error: regex "[^/]*" matched an empty string.

ablu added a comment.Apr 30 2020, 5:13 AM

The Build worked. So this solves the issue for me!

vkrause accepted this revision.May 8 2020, 9:12 AM
This revision is now accepted and ready to land.May 8 2020, 9:12 AM
dfaure closed this revision.May 8 2020, 9:13 AM

Revision Contents
Changeset List

PathPackages
Mmodules/ECMGeneratePriFile.cmake (8 lines)

Diff 81519

View Options

modules/ECMGeneratePriFile.cmake

Loading...