diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-03 12:34:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-03 16:26:37 +0100 |
| commit | d2179014f9f3be21873a4cf7d7bde5cbe7148daf (patch) | |
| tree | 2cfb45d892751a32434fe0492ad9c72ca2f7a9c0 /qmake | |
| parent | 5021c1d977c7f29379c049e57316364236f91aab (diff) | |
introduce QMAKE_RPATHLINKDIR (and QMAKE_LFLAGS_RPATHLINK)
complementary to QMAKE_RPATHDIR. this avoids that we need to sprinkle
linux/gcc specific code all over the place.
Task-number: QTBUG-27427
Change-Id: Iebafd1749d1a0d803704902473df8c743f074ddc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 82fd47f2ec..8a1a29c2c7 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -170,6 +170,13 @@ UnixMakefileGenerator::init() project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath()); } } + if (!project->isEmpty("QMAKE_RPATHLINKDIR")) { + const ProStringList &rpathdirs = project->values("QMAKE_RPATHLINKDIR"); + for (int i = 0; i < rpathdirs.size(); ++i) { + if (!project->isEmpty("QMAKE_LFLAGS_RPATHLINK")) + project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATHLINK") + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath()); + } + } if(project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS")) include_deps = true; //do not generate deps |