merge from trunk

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/sparserips-python@3935 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 81f81cb6b39ece77718c8b03d408a90789946c0f

1 files changed, 35 insertions, 6 deletions

diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index 7433f2f3..b020ebfc 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -8,11 +8,9 @@ endif(NOT Boost_FOUND)
 
 find_package(GMP)
 if(GMP_FOUND)
-  message(STATUS "GMP_LIBRARIES = ${GMP_LIBRARIES}")
   INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
   find_package(GMPXX)
   if(GMPXX_FOUND)
-    message(STATUS "GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}")
     INCLUDE_DIRECTORIES(${GMPXX_INCLUDE_DIR})
   endif()
 endif()
@@ -23,11 +21,11 @@ endif()
 # A fix would be to use https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
 # or even better https://cmake.org/cmake/help/v3.1/variable/CMAKE_CXX_STANDARD.html
 # but it implies to use cmake version 3.1 at least.
-find_package(CGAL)
+find_package(CGAL QUIET)
 
 # Only CGAL versions > 4.4 supports what Gudhi uses from CGAL
 if (CGAL_VERSION VERSION_LESS 4.4.0)
-  message("CGAL version ${CGAL_VERSION} is considered too old to be used by Gudhi.")
+  message("++ CGAL version ${CGAL_VERSION} is considered too old to be used by Gudhi.")
   unset(CGAL_FOUND)
 endif()
 if(CGAL_FOUND)
@@ -79,7 +77,6 @@ endif(WITH_GUDHI_USE_TBB)
 set(CGAL_WITH_EIGEN3_VERSION 0.0.0)
 find_package(Eigen3 3.1.0)
 if (EIGEN3_FOUND)
-  message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
   include( ${EIGEN3_USE_FILE} )
   set(CGAL_WITH_EIGEN3_VERSION ${CGAL_VERSION})
 endif (EIGEN3_FOUND)
@@ -119,7 +116,39 @@ message(STATUS "boost library dirs:" ${Boost_LIBRARY_DIRS})
 
 # Find the correct Python interpreter.
 # Can be set with -DPYTHON_EXECUTABLE=/usr/bin/python3 or -DPython_ADDITIONAL_VERSIONS=3 for instance.
-find_package(Cython)
+find_package( PythonInterp )
+
+# find_python_module tries to import module in Python interpreter and to retrieve its version number
+# returns ${PYTHON_MODULE_NAME_UP}_VERSION and ${PYTHON_MODULE_NAME_UP}_FOUND
+function( find_python_module PYTHON_MODULE_NAME )
+  string(TOUPPER ${PYTHON_MODULE_NAME} PYTHON_MODULE_NAME_UP)
+  execute_process(
+          COMMAND ${PYTHON_EXECUTABLE}  -c "import ${PYTHON_MODULE_NAME}; print(${PYTHON_MODULE_NAME}.__version__)"
+          RESULT_VARIABLE PYTHON_MODULE_RESULT
+          OUTPUT_VARIABLE PYTHON_MODULE_VERSION
+          ERROR_VARIABLE PYTHON_MODULE_ERROR)
+  message ("PYTHON_MODULE_NAME = ${PYTHON_MODULE_NAME}
+   - PYTHON_MODULE_RESULT = ${PYTHON_MODULE_RESULT}
+   - PYTHON_MODULE_VERSION = ${PYTHON_MODULE_VERSION}
+   - PYTHON_MODULE_ERROR = ${PYTHON_MODULE_ERROR}")
+  if(PYTHON_MODULE_RESULT EQUAL 0)
+    # Remove carriage return
+    string(STRIP ${PYTHON_MODULE_VERSION} PYTHON_MODULE_VERSION)
+    set(${PYTHON_MODULE_NAME_UP}_VERSION ${PYTHON_MODULE_VERSION} PARENT_SCOPE)
+    set(${PYTHON_MODULE_NAME_UP}_FOUND TRUE PARENT_SCOPE)
+  else()
+    unset(${PYTHON_MODULE_NAME_UP}_VERSION PARENT_SCOPE)
+    set(${PYTHON_MODULE_NAME_UP}_FOUND FALSE PARENT_SCOPE)
+  endif()
+endfunction( find_python_module )
+
+if( PYTHONINTERP_FOUND )
+  find_python_module("cython")
+  find_python_module("pytest")
+  find_python_module("matplotlib")
+  find_python_module("numpy")
+  find_python_module("scipy")
+endif()
 
 if(NOT GUDHI_CYTHON_PATH)
   message(FATAL_ERROR "ERROR: GUDHI_CYTHON_PATH is not valid.")