diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-11 08:09:01 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-11 08:09:01 +0200 |
| commit | 0f7cc48907e1b28e114d37e3bd30a2237d9f6c8c (patch) | |
| tree | d91e336fae47ffcc3f8090fa44725612346c81d3 | |
| parent | c04ff4c1f5c6aa7115c2e0e57f5ecc3ebb153fb2 (diff) | |
cannot import WinDLL from ctypes on non-windows systems
| -rw-r--r-- | CMakeGUDHIVersion.txt | 2 | ||||
| -rw-r--r-- | src/python/gudhi/_distributor_init.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index fab3ee75..21f3d58c 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -1,6 +1,6 @@ set (GUDHI_MAJOR_VERSION 3) set (GUDHI_MINOR_VERSION 2) -set (GUDHI_PATCH_VERSION 0a18) +set (GUDHI_PATCH_VERSION 0a19) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") diff --git a/src/python/gudhi/_distributor_init.py b/src/python/gudhi/_distributor_init.py index 0ed451f9..6f3dc8a2 100644 --- a/src/python/gudhi/_distributor_init.py +++ b/src/python/gudhi/_distributor_init.py @@ -3,8 +3,6 @@ Helper to preload windows dlls to prevent dll not found errors. Once a DLL is preloaded, its namespace is made available to any subsequent DLL. ''' import os -from ctypes import WinDLL -import glob if os.name == 'nt': # convention for storing / loading the DLL from gudhi/.libs/, if present try: @@ -14,5 +12,7 @@ if os.name == 'nt': else: libs_dir = os.path.abspath(os.path.join(basedir, '.libs')) if os.path.isdir(libs_dir): + from ctypes import WinDLL + import glob for filename in glob.glob(os.path.join(libs_dir, '*dll')): WinDLL(os.path.abspath(filename)) |