From e49ee6cfb25ac0bd02f51e3a9f587647d1b9a30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Antequera?= Date: Thu, 8 Jul 2021 09:51:05 +0200 Subject: [PATCH 1/2] PyAssimp fix: don't always search anaconda paths The helper was erroneously adding the Anaconda paths to the search. --- port/PyAssimp/pyassimp/helper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/port/PyAssimp/pyassimp/helper.py b/port/PyAssimp/pyassimp/helper.py index 7a4b2bdcb..7c14f6097 100644 --- a/port/PyAssimp/pyassimp/helper.py +++ b/port/PyAssimp/pyassimp/helper.py @@ -34,7 +34,8 @@ if os.name=='posix': additional_dirs.extend([item for item in os.environ['LD_LIBRARY_PATH'].split(':') if item]) # check if running from anaconda. - if "conda" or "continuum" in sys.version.lower(): + anaconda_keywords = ("conda", "continuum") + if any(k in sys.version.lower() for k in anaconda_keywords): cur_path = get_python_lib() pattern = re.compile('.*\/lib\/') conda_lib = pattern.match(cur_path).group() From 6e863b2435b59857f2d9d41262b6b110698f638b Mon Sep 17 00:00:00 2001 From: Rahul Sheth Date: Wed, 14 Jul 2021 08:27:04 -0400 Subject: [PATCH 2/2] Find stb for Assimp --- cmake/assimp-hunter-config.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/assimp-hunter-config.cmake.in b/cmake/assimp-hunter-config.cmake.in index 91efcbf24..5c5aeedfd 100644 --- a/cmake/assimp-hunter-config.cmake.in +++ b/cmake/assimp-hunter-config.cmake.in @@ -9,6 +9,7 @@ find_package(poly2tri CONFIG REQUIRED) find_package(polyclipping CONFIG REQUIRED) find_package(zip CONFIG REQUIRED) find_package(pugixml CONFIG REQUIRED) +find_package(stb CONFIG REQUIRED) if(@ASSIMP_BUILD_DRACO@) find_package(draco CONFIG REQUIRED)