Fix issue #4 : [CMake - global] List all that is missing

          #21 : [python - global] Additional information on how GUDHI was compiled could help to debug users problems



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

Former-commit-id: ded8b49b7e282dbf262df5695f2b5285a9907551

2 files changed, 27 insertions, 48 deletions

diff --git a/src/cmake/modules/FindCython.cmake b/src/cmake/modules/FindCython.cmake
deleted file mode 100644
index 04aed1f8..00000000
--- a/src/cmake/modules/FindCython.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-# Find the Cython compiler.
-#
-# This code sets the following variables:
-#
-#  CYTHON_EXECUTABLE
-#
-# See also UseCython.cmake
-
-#=============================================================================
-# Copyright 2011 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# Use the Cython executable that lives next to the Python executable
-# if it is a local installation.
-find_package( PythonInterp )
-if( PYTHONINTERP_FOUND )
-  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
-  find_program( CYTHON_EXECUTABLE
-    NAMES cython cython.bat cython3
-    HINTS ${_python_path}
-    )
-else()
-  find_program( CYTHON_EXECUTABLE
-    NAMES cython cython.bat cython3
-    )
-endif()
-
-
-include( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( Cython REQUIRED_VARS CYTHON_EXECUTABLE )
-
-mark_as_advanced( CYTHON_EXECUTABLE )
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index 7433f2f3..abee8f80 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()
@@ -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,33 @@ 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)
+  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")
+endif()
 
 if(NOT GUDHI_CYTHON_PATH)
   message(FATAL_ERROR "ERROR: GUDHI_CYTHON_PATH is not valid.")