aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/build_wrapper.py
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-02-07 13:28:24 +0100
committerEike Ziller <eike.ziller@qt.io>2018-02-07 12:53:45 +0000
commiteb59b3282d5417f5583b834ad6b6671b81659a76 (patch)
treef723265b9263c891aed3dacc00098477cec57ba3 /packaging-tools/build_wrapper.py
parent206e80a90172e1d2c7ff770ca5eec1647ca55d4b (diff)
Qt Creator/GammaRay: Force the right RPATHs
Some changes in the GammaRay build setup that fixed execution from a local build make this necessary. Change-Id: I67f68477304fee160b115986a752f4acb20bc783 Reviewed-by: Volker Krause <volker.krause@kdab.com>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
-rw-r--r--packaging-tools/build_wrapper.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py
index 6274a6e4a..5189ec66e 100644
--- a/packaging-tools/build_wrapper.py
+++ b/packaging-tools/build_wrapper.py
@@ -361,6 +361,8 @@ def handle_gammaray_build(optionDict):
cmd_args.extend(['--module_dir', os.path.join(work_dir, 'src', 'external', 'gammaray'),
'--module-name', 'gammaray',
'--qt5path', os.path.join(work_dir, 'gammaray_qt5_install'),
+ '--add-config-arg=-DCMAKE_SKIP_BUILD_RPATH=OFF',
+ '--add-config-arg=-DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF',
'--add-config-arg=-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE',
'--add-config-arg=-DGAMMARAY_MULTI_BUILD=OFF',
'--add-config-arg=-DBUILD_TESTING=OFF',