diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-28 01:04:17 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-28 01:04:17 +0300 |
commit | b6ac95145cf616a36e58c846e7fccbf7ccc69faa (patch) | |
tree | 916ec4c6900dbe1709002dcb41c2ceebdf983b67 /source/creator | |
parent | 79c90bd49fafd050883161798a45427d60ffd0ed (diff) | |
parent | da848b7440ab8878b350f764dfbf70729e43021d (diff) |
Merge branch 'master' into temp-gpu-image-enginetemp-gpu-image-engine
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( |