archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

CMake/Linux/Python:copy either chardet or charset_normalizer

Browse Source 
`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.
This commit is contained in:
Sybren A. Stüvel
2022-01-27 12:15:08 +01:00
parent 5400018106
commit 8a20aec403
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/creator/CMakeLists.txt
View File

@@ -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(