Commit cba1da46 authored by Eike Ziller's avatar Eike Ziller Committed by Joerg Bornemann

Qbs: fix rpaths and install names (mac)

Needs updated qbs submodule for rpath fixes and installNamePrefix.

Change-Id: I6428409f34e87f299ff2d8c72268bee72c1ba2f2
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 753dd851
......@@ -170,7 +170,8 @@ Project {
name: project.ide_app_target
consoleApplication: qbs.debugInformation
cpp.rpaths: ["$ORIGIN/../lib/qtcreator"]
cpp.rpaths: qbs.targetOS == "mac" ? ["@executable_path/.."]
: ["$ORIGIN/../lib/qtcreator"]
cpp.defines: Defaults.defines(qbs)
cpp.linkerFlags: {
if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
......
......@@ -13,6 +13,9 @@ DynamicLibrary {
if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
return ["-Wl,-s"]
}
cpp.installNamePrefix: "@rpath/PlugIns/"
cpp.rpaths: qbs.targetOS == "mac" ? ["@loader_path/..", "@executable_path/.."]
: ["$ORIGIN", "$ORIGIN/.."]
cpp.includePaths: [ ".", ".." ]
ProductModule {
......
......@@ -29,7 +29,9 @@ Product {
}
cpp.defines: Defaults.defines(qbs).concat([name.toUpperCase() + "_LIBRARY"])
cpp.rpaths: ["$ORIGIN/../.."]
cpp.installNamePrefix: "@rpath/PlugIns/" + provider + "/"
cpp.rpaths: qbs.targetOS == "mac" ? ["@loader_path/../..", "@executable_path/.."]
: ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."]
cpp.linkerFlags: {
if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
return ["-Wl,-s"]
......
......@@ -33,7 +33,7 @@ QtcPlugin {
])
cpp.libraryPaths: base.concat([qbs_build_dir + "/lib"])
cpp.rpaths: cpp.libraryPaths
cpp.rpaths: base.concat([qbs_build_dir + "/lib"])
cpp.dynamicLibraries: {
var libs = []
if (qbs.targetOS === "windows") {
......
Subproject commit 29bb66d2fdc863fd5e9b0896fbd862c5b999d541
Subproject commit 40c966d00bb2d33b7fc66fe1a68df2fc541efd1e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment