From 5c4c398b99fe1b157d64cd43a4977ce1504ca795 Mon Sep 17 00:00:00 2001
From: Marc Glisse <marc.glisse@inria.fr>
Date: Thu, 26 Mar 2020 22:25:28 +0100
Subject: HNSWlib doesn't define __version__

---
 src/cmake/modules/GUDHI_third_party_libraries.cmake | 21 ++++++++++++++++++++-
 src/python/CMakeLists.txt                           |  7 ++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index c2039674..a931b3a1 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -150,6 +150,25 @@ function( find_python_module PYTHON_MODULE_NAME )
   endif()
 endfunction( find_python_module )
 
+# For modules that do not define module.__version__
+function( find_python_module_no_version PYTHON_MODULE_NAME )
+  string(TOUPPER ${PYTHON_MODULE_NAME} PYTHON_MODULE_NAME_UP)
+  execute_process(
+          COMMAND ${PYTHON_EXECUTABLE}  -c "import ${PYTHON_MODULE_NAME}"
+          RESULT_VARIABLE PYTHON_MODULE_RESULT
+          ERROR_VARIABLE PYTHON_MODULE_ERROR)
+  if(PYTHON_MODULE_RESULT EQUAL 0)
+    # Remove carriage return
+    message ("++ Python module ${PYTHON_MODULE_NAME} found")
+    set(${PYTHON_MODULE_NAME_UP}_FOUND TRUE PARENT_SCOPE)
+  else()
+    message ("PYTHON_MODULE_NAME = ${PYTHON_MODULE_NAME}
+     - PYTHON_MODULE_RESULT = ${PYTHON_MODULE_RESULT}
+     - PYTHON_MODULE_ERROR = ${PYTHON_MODULE_ERROR}")
+    set(${PYTHON_MODULE_NAME_UP}_FOUND FALSE PARENT_SCOPE)
+  endif()
+endfunction( find_python_module_no_version )
+
 if( PYTHONINTERP_FOUND )
   find_python_module("cython")
   find_python_module("pytest")
@@ -161,8 +180,8 @@ if( PYTHONINTERP_FOUND )
   find_python_module("ot")
   find_python_module("pybind11")
   find_python_module("torch")
-  find_python_module("hnswlib")
   find_python_module("pykeops")
+  find_python_module_no_version("hnswlib")
 endif()
 
 if(NOT GUDHI_PYTHON_PATH)
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index d26d3e6e..ec0ab1ca 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -79,13 +79,14 @@ if(PYTHONINTERP_FOUND)
       add_gudhi_debug_info("POT version ${OT_VERSION}")
     endif()
     if(HNSWLIB_FOUND)
-      add_gudhi_debug_info("HNSWlib version ${OT_VERSION}")
+      # Does not have a version number...
+      add_gudhi_debug_info("HNSWlib found")
     endif()
     if(TORCH_FOUND)
-      add_gudhi_debug_info("PyTorch version ${OT_VERSION}")
+      add_gudhi_debug_info("PyTorch version ${TORCH_VERSION}")
     endif()
     if(PYKEOPS_FOUND)
-      add_gudhi_debug_info("PyKeOps version ${OT_VERSION}")
+      add_gudhi_debug_info("PyKeOps version ${PYKEOPS_VERSION}")
     endif()
 
     set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_RESULT_OF_USE_DECLTYPE', ")
-- 
cgit v1.2.3