Remove FindMPFR mechanism as the job is already done by CGAL

3 files changed, 19 insertions, 78 deletions

diff --git a/src/cmake/modules/FindMPFR.cmake b/src/cmake/modules/FindMPFR.cmake
deleted file mode 100644
index 6c963272..00000000
--- a/src/cmake/modules/FindMPFR.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-# Try to find the MPFR libraries
-# MPFR_FOUND - system has MPFR lib
-# MPFR_INCLUDE_DIR - the MPFR include directory
-# MPFR_LIBRARIES_DIR - Directory where the MPFR libraries are located
-# MPFR_LIBRARIES - the MPFR libraries
-
-# TODO: support MacOSX
-
-include(FindPackageHandleStandardArgs)
-
-if(MPFR_INCLUDE_DIR)
-  set(MPFR_in_cache TRUE)
-else()
-  set(MPFR_in_cache FALSE)
-endif()
-if(NOT MPFR_LIBRARIES)
-  set(MPFR_in_cache FALSE)
-endif()
-
-# Is it already configured?
-if (MPFR_in_cache)
-  set(MPFR_FOUND TRUE)
-else()
-  find_path(MPFR_INCLUDE_DIR
-            NAMES mpfr.h
-            HINTS ENV MPFR_INC_DIR
-                  ENV MPFR_DIR
-                  ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/include
-            PATH_SUFFIXES include
-  	        DOC "The directory containing the MPFR header files"
-           )
-
-  find_library(MPFR_LIBRARIES NAMES mpfr libmpfr-4 libmpfr-1
-    HINTS ENV MPFR_LIB_DIR
-          ENV MPFR_DIR
-          ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/lib
-    PATH_SUFFIXES lib
-    DOC "Path to the MPFR library"
-    )
-
-  if ( MPFR_LIBRARIES )
-    get_filename_component(MPFR_LIBRARIES_DIR ${MPFR_LIBRARIES} PATH CACHE )
-  endif()
-
-  # Attempt to load a user-defined configuration for MPFR if couldn't be found
-  if ( NOT MPFR_INCLUDE_DIR OR NOT MPFR_LIBRARIES_DIR )
-    include( MPFRConfig OPTIONAL )
-  endif()
-
-  find_package_handle_standard_args(MPFR "DEFAULT_MSG" MPFR_LIBRARIES MPFR_INCLUDE_DIR)
-endif()
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index d8c7a428..24a34150 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -6,8 +6,6 @@ if(NOT Boost_FOUND)
   message(FATAL_ERROR "NOTICE: This program requires Boost and will not be compiled.")
 endif(NOT Boost_FOUND)
 
-find_package(MPFR)
-
 find_package(GMP)
 if(GMP_FOUND)
   INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index 13a8a909..1704f491 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -230,14 +230,12 @@ endif(CGAL_FOUND)
 
     # Test examples
     if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
-      if (MPFR_FOUND)
-        # Bottleneck and Alpha
-        add_test(NAME alpha_rips_persistence_bottleneck_distance_py_test
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                 COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
-                 ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_rips_persistence_bottleneck_distance.py"
-                 -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -t 0.15 -d 3)
-      endif(MPFR_FOUND)
+      # Bottleneck and Alpha
+      add_test(NAME alpha_rips_persistence_bottleneck_distance_py_test
+               WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+               COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+               ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_rips_persistence_bottleneck_distance.py"
+               -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -t 0.15 -d 3)
       if(MATPLOTLIB_FOUND AND NUMPY_FOUND)
         # Tangential
         add_test(NAME tangential_complex_plain_homology_from_off_file_example_py_test
@@ -308,23 +306,19 @@ endif(CGAL_FOUND)
     endif (NOT CGAL_VERSION VERSION_LESS 4.11.0)
 
     if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
-      if (MPFR_FOUND)
-        # Alpha
-        add_test(NAME alpha_complex_from_points_example_py_test
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                 COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
-                 ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py")
-  
-        if(MATPLOTLIB_FOUND AND NUMPY_FOUND)
-          add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                 COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
-                 ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_diagram_persistence_from_off_file_example.py"
-                 --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 0.6)
-        endif()
-  
-        add_gudhi_py_test(test_alpha_complex)
-      endif(MPFR_FOUND)
+      # Alpha
+      add_test(NAME alpha_complex_from_points_example_py_test
+               WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+               COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+               ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py")
+      if(MATPLOTLIB_FOUND AND NUMPY_FOUND)
+        add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test
+               WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+               COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}"
+               ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_diagram_persistence_from_off_file_example.py"
+               --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 0.6)
+      endif()
+      add_gudhi_py_test(test_alpha_complex)
     endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
 
     if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)