qmake: improve the .pc files generator
Don't hardcode the "qt_config" EXTRA variable and use QMAKE_PKGCONFIG_VARIABLES instead. This allows qmake create the .pc files that are unrelated to Qt. Change-Id: Ic72005e8819a15f6c50f3aaf79424a247fba20af Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
parent
2ff6086e06
commit
d53f5db953
@ -227,6 +227,11 @@ DEFINES *= QT_DEPRECATED_WARNINGS
|
|||||||
|
|
||||||
TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
|
TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
|
||||||
|
|
||||||
|
# Provides useful info normally only contained in the internal .qmake.cache file
|
||||||
|
qt_conf.name = qt_config
|
||||||
|
qt_conf.variable = CONFIG
|
||||||
|
QMAKE_PKGCONFIG_VARIABLES += qt_conf
|
||||||
|
|
||||||
load(qt_targets)
|
load(qt_targets)
|
||||||
|
|
||||||
win32:DEFINES+=_USE_MATH_DEFINES
|
win32:DEFINES+=_USE_MATH_DEFINES
|
||||||
|
@ -3201,9 +3201,7 @@ MakefileGenerator::writePkgConfigFile()
|
|||||||
t << "exec_prefix=${prefix}\n"
|
t << "exec_prefix=${prefix}\n"
|
||||||
<< "libdir=" << pkgConfigFixPath(libDir) << "\n"
|
<< "libdir=" << pkgConfigFixPath(libDir) << "\n"
|
||||||
<< "includedir=" << pkgConfigFixPath(includeDir) << endl;
|
<< "includedir=" << pkgConfigFixPath(includeDir) << endl;
|
||||||
// non-standard entry. Provides useful info normally only
|
t << endl;
|
||||||
// contained in the internal .qmake.cache file
|
|
||||||
t << varGlue("CONFIG", "qt_config=", " ", "") << endl;
|
|
||||||
|
|
||||||
//extra PKGCONFIG variables
|
//extra PKGCONFIG variables
|
||||||
const QStringList &pkgconfig_vars = project->values("QMAKE_PKGCONFIG_VARIABLES");
|
const QStringList &pkgconfig_vars = project->values("QMAKE_PKGCONFIG_VARIABLES");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user