From 2f795d3b0ec7b8e63645375697052cb062dec264 Mon Sep 17 00:00:00 2001 From: "Frank T. Bergmann" Date: Fri, 7 Aug 2020 12:28:46 +0200 Subject: [PATCH] - fully specify where to get the libraries from --- setup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup.py b/setup.py index a60383c..de0c4a7 100644 --- a/setup.py +++ b/setup.py @@ -264,8 +264,14 @@ def build_cmake(self, extension): cmake_args = cmake_args + libsbml_args if DEP_DIR: + zlib = get_lib_full_path(os.path.join(DEP_DIR, 'lib'), 'zlib') + if not zlib: + zlib = get_lib_full_path(os.path.join(DEP_DIR, 'lib'), 'zdll') cmake_args.append('-DLIBSBML_DEPENDENCY_DIR=' + DEP_DIR) cmake_args.append('-DLIBEXPAT_INCLUDE_DIR=' + join(DEP_DIR, 'include')) + cmake_args.append('-DLIBEXPAT_LIBRARY=' + get_lib_full_path(os.path.join(DEP_DIR, 'lib'), 'expat')) + cmake_args.append('-DLIBZ_LIBRARY=' + zlib) + cmake_args.append('-DLIBBZ_LIBRARY=' + get_lib_full_path(os.path.join(dep_inst_dir, 'lib'), 'bz2')) if is_win_32: if DEP_DIR32: