1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ability to override the generated pkg-config file name

Browse Source 
introduce the QMAKE_PKGCONFIG_FILE variable for that purpose.

this is another feature that is needed for a bugfix ...

Change-Id: I08f470e1b2b7dd318af9195330c15d813fcd55ef
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-02-04 12:27:34 +01:00 committed by The Qt Project
parent dcada2a05d
commit 5a0ec1b0f3
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qmake/generators/makefile.cpp
View File

@ -3110,15 +3110,18 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
QString QString
MakefileGenerator::pkgConfigFileName(bool fixify) MakefileGenerator::pkgConfigFileName(bool fixify)
{ {
QString ret = var("TARGET"); QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
if (ret.isEmpty()) {
ret = project->first("TARGET").toQString();
int slsh = ret.lastIndexOf(Option::dir_sep); int slsh = ret.lastIndexOf(Option::dir_sep);
if(slsh != -1) if (slsh != -1)
ret = ret.right(ret.length() - slsh - 1); ret = ret.right(ret.length() - slsh - 1);
if(ret.startsWith("lib")) if (ret.startsWith("lib"))
ret = ret.mid(3); ret = ret.mid(3);
int dot = ret.indexOf('.'); int dot = ret.indexOf('.');
if(dot != -1) if (dot != -1)
ret = ret.left(dot); ret = ret.left(dot);
}
ret += Option::pkgcfg_ext; ret += Option::pkgcfg_ext;
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) { if(!subdir.isEmpty()) {