diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2022-01-27 14:15:08 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2022-01-27 17:10:05 +0300 |
| commit | 8a20aec40305eba12900d2ed3a63610c6cc3a3e3 (patch) | |
| tree | e0154dd54f2f67c6a38a55a833acc4eae1fe8754 /source/creator | |
| parent | 54000181067f7d2efab6b7644ec27b92d5d9bf37 (diff) | |
CMake/Linux/Python:copy either `chardet` or `charset_normalizer`
`chardet` was replaced by `charset_normalizer` for modern `requests`.
With this change, `{make,ninja} install` will also copy the latter into
Blender's install directory.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 0609b8fd792..6f23fbe486a 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -685,7 +685,11 @@ if(UNIX AND NOT APPLE) PATTERN "*.pyo" EXCLUDE # * any cache * ) # On some platforms requests does have extra dependencies. - set(_requests_deps "certifi" "chardet" "idna" "urllib3") + # + # Either 'chardet' or 'charset_normalizer" is used, depending on the + # version of Python. The code below silently skips the one that's not + # available, so we can just list both here. + set(_requests_deps "certifi" "chardet" "charset_normalizer" "idna" "urllib3") foreach(_requests_dep ${_requests_deps}) if(EXISTS ${PYTHON_REQUESTS_PATH}/${_requests_dep}) install( |