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

don't emit -L/-F/-I with system dirs to .pc files

Browse Source 
Change-Id: Idecb6f8ba61872c23856a8c7e22305c01c67f0b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
This commit is contained in:
Oswald Buddenhagen 2014-04-14 16:27:01 +02:00 committed by The Qt Project
parent 3fdf53786f
commit 50b25458cc
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qmake/generators/makefile.cpp
View File

@ -3284,10 +3284,12 @@ MakefileGenerator::writePkgConfigFile()
// libs // libs
t << "Libs: "; t << "Libs: ";
QString pkgConfiglibDir;
QString pkgConfiglibName; QString pkgConfiglibName;
if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")) { if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")) {
pkgConfiglibDir = "-F${libdir}"; if (libDir != QLatin1String("/System/Library/Frameworks")
&& libDir != QLatin1String("/Library/Frameworks")) {
t << "-F${libdir} ";
}
ProString bundle; ProString bundle;
if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME"))
bundle = unescapeFilePath(project->first("QMAKE_FRAMEWORK_BUNDLE_NAME")); bundle = unescapeFilePath(project->first("QMAKE_FRAMEWORK_BUNDLE_NAME"));
@ -3298,12 +3300,13 @@ MakefileGenerator::writePkgConfigFile()
bundle = bundle.left(suffix); bundle = bundle.left(suffix);
pkgConfiglibName = "-framework " + bundle + " "; pkgConfiglibName = "-framework " + bundle + " ";
} else { } else {
pkgConfiglibDir = "-L${libdir}"; if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
t << "-L${libdir} ";
pkgConfiglibName = "-l" + unescapeFilePath(project->first("QMAKE_ORIG_TARGET")); pkgConfiglibName = "-l" + unescapeFilePath(project->first("QMAKE_ORIG_TARGET"));
if (project->isActiveConfig("shared")) if (project->isActiveConfig("shared"))
pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString(); pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
} }
t << pkgConfiglibDir << " " << pkgConfiglibName << " \n"; t << pkgConfiglibName << " \n";
ProStringList libs; ProStringList libs;
if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) { if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) {
@ -3327,7 +3330,10 @@ MakefileGenerator::writePkgConfigFile()
<< varGlue("PRL_EXPORT_CXXFLAGS", "", " ", " ") << varGlue("PRL_EXPORT_CXXFLAGS", "", " ", " ")
<< varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")
// << varGlue("DEFINES","-D"," -D"," ") // << varGlue("DEFINES","-D"," -D"," ")
<< "-I${includedir}\n"; ;
if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))
t << "-I${includedir}";
t << endl;
// requires // requires
const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' ');