merge fix

Author: hschreiber

src/cmake/modules/GUDHI_third_party_libraries.cmake

@@ -193,10 +193,11 @@ if (WITH_GUDHI_PYTHON)
     endif()
   endif()
 
+
   if(NOT GUDHI_PYTHON_PATH)
     message(FATAL_ERROR "ERROR: GUDHI_PYTHON_PATH is not valid.")
   endif(NOT GUDHI_PYTHON_PATH)
 
   option(WITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS "Build with setting runtime_library_dirs. Useful when setting rpath is not allowed" ON)
 
-endif (WITH_GUDHI_PYTHON)
+endif (WITH_GUDHI_PYTHON)

src/python/CMakeLists.txt

@@ -131,6 +131,7 @@ if(SCIPY_FOUND)
 else()
   disable_python_documentation("scipy")
 endif()
+if(SCIKIT-LEARN_FOUND)
   add_gudhi_debug_info("Scikit-learn version ${SCIKIT-LEARN_VERSION}")
 else()
   disable_python_documentation("scikit-learn")
@@ -714,4 +715,4 @@ if(MATPLOTLIB_FOUND)
 endif()
 
 # Set missing or not modules
-set(GUDHI_MODULES ${GUDHI_MODULES} "python" CACHE INTERNAL "GUDHI_MODULES")
+set(GUDHI_MODULES ${GUDHI_MODULES} "python" CACHE INTERNAL "GUDHI_MODULES")