|
49 | 49 |
|
50 | 50 | if platform.system() == "Windows": |
51 | 51 | for file in os.listdir(os.path.join(PYHELICS_INSTALL, "bin")): |
52 | | - if "helicsShared" in file: |
| 52 | + if "helics" in file and file.endswith(".dll"): |
53 | 53 | try: |
54 | 54 | lib = ffi.dlopen(os.path.join(PYHELICS_INSTALL, "bin", file)) |
55 | 55 | break |
|
69 | 69 | raise Exception("Unable to load helics shared library") |
70 | 70 | elif platform.system() == "Darwin": |
71 | 71 | for file in os.listdir(os.path.join(PYHELICS_INSTALL, "lib")): |
72 | | - if "helicsSharedLib" in file: |
| 72 | + if "helicsSharedLib" in file or "libhelics" in file and file.endswith(".dylib"): |
73 | 73 | lib = ffi.dlopen(os.path.join(PYHELICS_INSTALL, "lib", file)) |
74 | 74 | break |
75 | 75 | else: |
76 | | - lib = ffi.dlopen("helicsSharedLib.dylib") |
| 76 | + try: |
| 77 | + lib = ffi.dlopen("libhelics.dylib") |
| 78 | + except: |
| 79 | + lib = ffi.dlopen("helicsSharedLib.dylib") |
77 | 80 | if lib is None: |
78 | 81 | raise Exception("Unable to load helics shared library") |
79 | 82 | elif platform.system() == "Linux": |
80 | 83 | for file in os.listdir(os.path.join(PYHELICS_INSTALL, "lib")): |
81 | | - if "helicsSharedLib" in file: |
| 84 | + if "helicsSharedLib" in file or "libhelics" in file and file.endswith(".so"): |
82 | 85 | lib = ffi.dlopen(os.path.join(PYHELICS_INSTALL, "lib", file)) |
83 | 86 | break |
84 | 87 | else: |
85 | | - lib = ffi.dlopen("helicsSharedLib.so") |
| 88 | + try: |
| 89 | + lib = ffi.dlopen("libhelics.so") |
| 90 | + except: |
| 91 | + lib = ffi.dlopen("helicsSharedLib.so") |
86 | 92 | if lib is None: |
87 | 93 | raise Exception("Unable to load helics shared library") |
0 commit comments