feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Adapt RPATHs to new libexec path.

Browse Source 
Task-number: QTCREATORBUG-14725
Change-Id: I4b5c76faa878897ca7fbf1fe01945550a2d82964
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-07-13 17:22:30 +02:00
parent c3192d908b
commit 4d81239051
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qbs/imports/QtcTool.qbs
View File

@@ -1,10 +1,19 @@
import qbs 1.0 import qbs
import qbs.FileInfo
QtcProduct { QtcProduct {
type: "application" // no Mac app bundle type: "application" // no Mac app bundle
installDir: project.ide_libexec_path installDir: project.ide_libexec_path
cpp.rpaths: qbs.targetOS.contains("osx") cpp.rpaths: {
? ["@executable_path/../" + project.ide_library_path] var relativePathToLibs
: ["$ORIGIN/../" + project.ide_library_path] = FileInfo.relativePath(project.ide_libexec_path, project.ide_library_path);
var relativePathToPlugins
= FileInfo.relativePath(project.ide_libexec_path, project.ide_plugin_path);
var prefix = qbs.targetOS.contains("osx") ? "@executable_path" : "$ORIGIN";
return [
FileInfo.joinPaths(prefix, relativePathToLibs),
FileInfo.joinPaths(prefix, relativePathToPlugins)
];
}
} }

5
src/plugins/cpaster/frontend/frontend.qbs
View File

@@ -10,11 +10,6 @@ QtcTool {
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
cpp.rpaths: [
"$ORIGIN/../" + project.libDirName + "/qtcreator",
"$ORIGIN/../" + project.libDirName + "/qtcreator/plugins",
]
Group { Group {
name: "Frontend Sources" name: "Frontend Sources"
files: [ files: [

11
src/qtcreatortool.pri
View File

@@ -1,5 +1,4 @@
include(../qtcreator.pri) include(../qtcreator.pri)
include(rpath.pri)
TEMPLATE = app TEMPLATE = app
@@ -7,5 +6,15 @@ CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
DESTDIR = $$IDE_LIBEXEC_PATH 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) target.path = $$QTC_PREFIX/$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BUILD_TREE)
INSTALLS += target INSTALLS += target