diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-10-31 18:33:39 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-11-02 12:04:10 +0100 |
| commit | ccbb1b4417fad4fb93bd8788ef2bb8d607ef56ae (patch) | |
| tree | d956d50c409784e610163cc369d2c7acece602ba /sources/pyside6/cmake/Macros/PySideModules.cmake | |
| parent | a55ebc97413764229cb53d4a73f6d784e63cefff (diff) | |
CMake: Add Qt bin dir to PATH when calling generate_pyi.py
To ensure the Qt modules can be imported, even if Qt is not in PATH.
Pick-to: 6.4
Task-number: PYSIDE-1844
Change-Id: I64d939c0323980ce2292b48ca59cef138a979ebc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/cmake/Macros/PySideModules.cmake')
| -rw-r--r-- | sources/pyside6/cmake/Macros/PySideModules.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sources/pyside6/cmake/Macros/PySideModules.cmake b/sources/pyside6/cmake/Macros/PySideModules.cmake index 7d49f2ac9..60a863d0a 100644 --- a/sources/pyside6/cmake/Macros/PySideModules.cmake +++ b/sources/pyside6/cmake/Macros/PySideModules.cmake @@ -192,7 +192,17 @@ macro(create_pyside_module) else() set(ld_prefix_var_name "LD_LIBRARY_PATH") endif() - set(ld_prefix "${ld_prefix_var_name}=${pysidebindings_BINARY_DIR}/libpyside${PATH_SEP}${pysidebindings_BINARY_DIR}/libpysideqml${PATH_SEP}${SHIBOKEN_SHARED_LIBRARY_DIR}") + + set(ld_prefix_list "") + list(APPEND ld_prefix_list "${pysidebindings_BINARY_DIR}/libpyside") + list(APPEND ld_prefix_list "${pysidebindings_BINARY_DIR}/libpysideqml") + list(APPEND ld_prefix_list "${SHIBOKEN_SHARED_LIBRARY_DIR}") + if(WIN32) + list(APPEND ld_prefix_list "${QT6_INSTALL_PREFIX}/${QT6_INSTALL_BINS}") + endif() + + list(JOIN ld_prefix_list "${PATH_SEP}" ld_prefix_values_string) + set(ld_prefix "${ld_prefix_var_name}=${ld_prefix_values_string}") # Append any existing ld_prefix values, so existing PATH, LD_LIBRARY_PATH, etc. # On Windows it is needed because pyside modules import Qt, |