diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-13 17:22:30 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-14 08:56:41 +0000 |
| commit | 4d812390512771c53ecd176612f0dbbdc7f8177f (patch) | |
| tree | bc2222e4ae38b89128dabbad4575243144938fa4 /src/qtcreatortool.pri | |
| parent | c3192d908bf2d2575d93b49733b6dce9d6cca2bb (diff) | |
| download | qt-creator-4d812390512771c53ecd176612f0dbbdc7f8177f.tar.gz | |
Adapt RPATHs to new libexec path.
Task-number: QTCREATORBUG-14725
Change-Id: I4b5c76faa878897ca7fbf1fe01945550a2d82964
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/qtcreatortool.pri')
| -rw-r--r-- | src/qtcreatortool.pri | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/qtcreatortool.pri b/src/qtcreatortool.pri index 3fb262ad1d..2d33df626c 100644 --- a/src/qtcreatortool.pri +++ b/src/qtcreatortool.pri @@ -1,5 +1,4 @@ include(../qtcreator.pri) -include(rpath.pri) TEMPLATE = app @@ -7,5 +6,15 @@ CONFIG += console CONFIG -= app_bundle DESTDIR = $$IDE_LIBEXEC_PATH +REL_PATH_TO_LIBS = $$relative_path($$IDE_LIBRARY_PATH, $$IDE_LIBEXEC_PATH) +REL_PATH_TO_PLUGINS = $$relative_path($$IDE_PLUGIN_PATH, $$IDE_LIBEXEC_PATH) +osx { + QMAKE_LFLAGS += -Wl,-rpath,@executable_path/$$REL_PATH_TO_LIBS,-rpath,@executable_path/$$REL_PATH_TO_PLUGINS +} else { + QMAKE_RPATHDIR += \$\$ORIGIN/$$REL_PATH_TO_LIBS + QMAKE_RPATHDIR += \$\$ORIGIN/$$REL_PATH_TO_PLUGINS +} +include(rpath.pri) + target.path = $$QTC_PREFIX/$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BUILD_TREE) INSTALLS += target |