|
|
When cross-compiling, the python interpreter found by CMake is the
device one (or at least it's supposed to be), which means we can't use
it to execute python scripts on the host machine to extract shiboken
and pyside version information.
Instead of keeping the version numbers in python files, place them
into new .cmake.conf files that CMake can include in CMake projects
directly. This aligns with storing version information like Qt6 does.
setup.py and coin_build_instructions need version info as well, so
they will now parse the set() assignments in pyside6/.cmake.conf.
Ideally we would have called cmake with a minimal project that outputs
those values, but we don't have access to the CMake executable path
within coin_build_instructions.py, so we rely on parsing instead.
Qt Conan integration does the same, so we should be good, the
.cmake.conf file format is unlikely to change and cause breakages.
We also modify shiboken_version.py and pyside_version.py to use the
new variables when calling configure_file(), because we still ship
those files in the wheels.
Amends b57c557c8cd1012851f8a245075591dc33be425b
Pick-to: 6.2
Change-Id: Icc830069cd459c214ec253840ba6754ece50854e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
