diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-20 16:52:16 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-20 16:52:16 +0200 |
| commit | 1aae4a386f21f318340396af7dc50908e86af7f0 (patch) | |
| tree | bf7337ddf81e8382bd3963c68e3660c7b7e79557 /sources/pyside2/cmake/Macros | |
| parent | 6d5ca98cad443cc3d10e28262d9a05ff47ba660a (diff) | |
| parent | 8689054da961be4cede5cfae7c6a6f9d6efc36a4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I36594dc6d6f5f56656d1cab2b1e9c44b57e56386
Diffstat (limited to 'sources/pyside2/cmake/Macros')
| -rw-r--r-- | sources/pyside2/cmake/Macros/PySideModules.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index cbf401102..77dc8c8ac 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -169,6 +169,19 @@ macro(create_pyside_module) set(ld_prefix "LD_LIBRARY_PATH=") endif() set(ld_prefix "${ld_prefix}${pysidebindings_BINARY_DIR}/libpyside${PATH_SEP}${SHIBOKEN_SHARED_LIBRARY_DIR}") + + # On Windows we also need to propagate the whole environment PATH value, because pyside modules + # import Qt, and the Qt modules are found from PATH. + if(WIN32) + # Get the value of PATH with CMake separators. + file(TO_CMAKE_PATH "$ENV{PATH}" path_value) + + # Replace the CMake list separators with "\;"s, to avoid the PATH values being + # interpreted as CMake list elements, we actually want to pass the whole string separated + # by ";" to the command line. + make_path(path_value "${path_value}") + string(APPEND ld_prefix "${PATH_SEP}${path_value}") + endif() set(generate_pyi_options run --skip --sys-path "${pysidebindings_BINARY_DIR}" "${SHIBOKEN_PYTHON_MODULE_DIR}") |