Skip to content

Commit bedb72c

Browse files
committed
Another attempt at pointing PySide to the right Python include dir
Signed-off-by: Jean-Francois Panisset <[email protected]>
1 parent f72186c commit bedb72c

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
--- a/build_scripts/build_info_collector.py
22
+++ b/build_scripts/build_info_collector.py
3-
@@ -65,8 +65,8 @@
3+
@@ -65,7 +65,7 @@
44
py_include_dir):
55
"""Helper for finding the Python library on UNIX"""
66
if py_libdir is None or not Path(py_libdir).exists():
77
- py_libdir = Path(py_prefix) / "lib"
8-
- if py_include_dir is None or not Path(py_include_dir).exists():
98
+ py_libdir = Path(py_prefix) / "lib64"
10-
+ if True or py_include_dir is None or not Path(py_include_dir).exists():
9+
if py_include_dir is None or not Path(py_include_dir).exists():
1110
directory = f"include/python{py_version}"
1211
py_include_dir = Path(py_prefix) / directory
13-
lib_exts = ['.so']
12+
@@ -202,6 +202,10 @@
13+
else:
14+
py_scripts_dir = py_prefix / "bin"
15+
self.py_scripts_dir = py_scripts_dir
16+
+ # ASWF: with a non relocatable Python Conan package, sysconfig
17+
+ # returns a path to the Python package inside the build folder
18+
+ directory = f"include/python{py_version}"
19+
+ py_include_dir = py_prefix / directory
20+
else:
21+
# We don't look for an interpreter when cross-compiling.
22+
py_executable = None

0 commit comments

Comments
 (0)