aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/build_wrapper.py
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-02-16 09:42:16 +0100
committerEike Ziller <eike.ziller@qt.io>2018-02-16 11:50:22 +0000
commitc3cdc1f693e44a4913de4bce7f5f9870dc8fd1b9 (patch)
tree238b280364ef3b37769e18a40469a165d8d492fd /packaging-tools/build_wrapper.py
parent35c51ca6daa04539466f35d85d95c6a27159cd4f (diff)
QtCreator/GammaRay: Use "Qt install layout"v5.11.0-alpha1-packaging
Should resolve issues with deploying more recent GammaRay version which install into lib64 on 64-bit systems by default (which we don't want for the Qt Creator integration). Change-Id: I51ed085e6005e45db36b48baca04f27f461e770d Reviewed-by: Volker Krause <volker.krause@kdab.com>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
-rw-r--r--packaging-tools/build_wrapper.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py
index 379e29905..2ff7e35ed 100644
--- a/packaging-tools/build_wrapper.py
+++ b/packaging-tools/build_wrapper.py
@@ -378,6 +378,7 @@ 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=-DGAMMARAY_INSTALL_QT_LAYOUT=ON',
'--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',