From 2b4a3b49f8ac33ea5b4ec36e175e3c3de1d1fdab Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Thu, 4 Jul 2013 10:40:48 +0200
Subject: Fix rpath on OSX for the qbs build.

Change-Id: I0e8867d3736c4597a1a0e114252a086fdb4a0487
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 qbs.qbs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'qbs.qbs')

diff --git a/qbs.qbs b/qbs.qbs
index 62864d87f..62ee68f51 100644
--- a/qbs.qbs
+++ b/qbs.qbs
@@ -5,8 +5,14 @@ Project {
     property bool enableRPath: true
     property bool installApiHeaders: true
     property path libInstallDir: qbs.targetOS.contains("windows") ? "bin" : "lib"
-    property path libRPaths: (project.enableRPath && qbs.targetOS.contains("linux"))
-                ? ["$ORIGIN/../lib"] : undefined
+    property path libRPaths: {
+        if (!project.enableRPath)
+            return undefined;
+        if (qbs.targetOS.contains("linux"))
+            return ["$ORIGIN/../lib"];
+        if (qbs.targetOS.contains("osx"))
+            return ["@loader_path/../lib"]
+    }
     property path resourcesInstallDir: ""
 
     references: [
-- 
cgit v1.2.3