Merge remote-tracking branch 'origin/develop' into python_use_setuptools

2022-02-02 11:47:13 -05:00
parent d9c51ca124 172f88a0d5
commit 82ac7c9e12
1747 changed files with 14406 additions and 11299 deletions
--- a/python/lammps/core.py
+++ b/python/lammps/core.py
@ -89,6 +89,9 @@ class lammps(object):
    modpath = dirname(abspath(getsourcefile(lambda:0)))
    # for windows installers the shared library is in a different folder
    winpath = abspath(os.path.join(modpath,'..','..','bin'))
+    # allow override for running tests on Windows
+    if (os.environ.get("LAMMPSDLLPATH")):
+      winpath = os.environ.get("LAMMPSDLLPATH")
    self.lib = None
    self.lmp = None