aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts/main.py
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2018-06-21 23:37:16 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2018-06-22 09:02:48 +0000
commit56ff122f06418f437a1e8c950f76e7f504d1bef0 (patch)
tree461caf7d80cfb618f3cf064604f8e21901282964 /build_scripts/main.py
parentf3b87fead2d4cb2a790f0709080551e252d5a46c (diff)
Fix pyside2-rcc to work on macOS during build process
When preparing the PySide2 package during a build, regenerate_qt_resources is used on the copied examples to regenerate the qt resource files for Python3. This uses the pyside2-rcc tool. The problem was that it failed to find the Qt libraries, due to missing a rpath entry. Fix the problem as it is done for shiboken currently, by embedding the qt rpath value at build time. This get rids of a bunch of error messages during the build. Change-Id: I65459bf42818bdac0c6487c6fdd58bf5270d150e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts/main.py')
-rw-r--r--build_scripts/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py
index 579cfeae..616cff60 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -1019,7 +1019,7 @@ class PysideBuild(_build):
cmake_cmd.append("-DPYSIDE_SETUP_PY_PACKAGE_TIMESTAMP={}".format(
timestamp))
- if extension.lower() == "shiboken2":
+ if extension.lower() in ["shiboken2", "pyside2-tools"]:
cmake_cmd.append("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=yes")
if sys.version_info[0] > 2:
cmake_cmd.append("-DUSE_PYTHON_VERSION=3.3")