From ec3f93103f5a1937d3f8bbf37af3837a1089bf03 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 19 May 2017 16:13:50 +0000
Subject: Move src/common/utilities/hypergenerator.cpp in src/common/utilities
 Management of Python distribution packages make install is now installing
 utilities and GUDHI python module

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

Former-commit-id: a85576c7ae062718900f0db2bfb0dd3f26e87177
---
 src/cmake/modules/GUDHI_modules.cmake               | 17 -----------------
 src/cmake/modules/GUDHI_third_party_libraries.cmake |  7 ++++++-
 src/cmake/modules/GUDHI_user_version_target.cmake   |  2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'src/cmake')

diff --git a/src/cmake/modules/GUDHI_modules.cmake b/src/cmake/modules/GUDHI_modules.cmake
index 6a26d7bf..20fc8d17 100644
--- a/src/cmake/modules/GUDHI_modules.cmake
+++ b/src/cmake/modules/GUDHI_modules.cmake
@@ -5,23 +5,6 @@ function(add_gudhi_module file_path)
     set(GUDHI_MODULES ${GUDHI_MODULES} ${file_path} PARENT_SCOPE)
 endfunction(add_gudhi_module)
 
-# Add your new module in the list, order is not important
-
-add_gudhi_module(common)
-add_gudhi_module(Alpha_complex)
-add_gudhi_module(Bitmap_cubical_complex)
-add_gudhi_module(Bottleneck_distance)
-add_gudhi_module(Contraction)
-add_gudhi_module(Hasse_complex)
-add_gudhi_module(Persistent_cohomology)
-add_gudhi_module(Rips_complex)
-add_gudhi_module(Simplex_tree)
-add_gudhi_module(Skeleton_blocker)
-add_gudhi_module(Spatial_searching)
-add_gudhi_module(Subsampling)
-add_gudhi_module(Tangential_complex)
-add_gudhi_module(Witness_complex)
-
 # message("++ GUDHI_MODULES list is:\"${GUDHI_MODULES}\"")
 
 if (WITH_GUDHI_BENCHMARK)
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index 5f84c602..8cb01d3c 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -135,10 +135,15 @@ if(PYTHONINTERP_FOUND AND CYTHON_FOUND)
     # Documentation generation is available through sphinx
     find_program( SPHINX_PATH sphinx-build )
   elseif(PYTHON_VERSION_MAJOR EQUAL 3)
-    # Documentation generation is available through sphinx
+    # No sphinx-build in Pyton3, just hack it
     set(SPHINX_PATH "${CMAKE_SOURCE_DIR}/${GUDHI_CYTHON_PATH}/doc/python3-sphinx-build")
   else()
     message(FATAL_ERROR "ERROR: Try to compile the Cython interface. Python version ${PYTHON_VERSION_STRING} is not valid.")
   endif(PYTHON_VERSION_MAJOR EQUAL 2)
+  # get PYTHON_SITE_PACKAGES relative path from a python command line
+  execute_process(
+    COMMAND "${PYTHON_EXECUTABLE}" -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(prefix='', plat_specific=True))"
+    OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif(PYTHONINTERP_FOUND AND CYTHON_FOUND)
 
diff --git a/src/cmake/modules/GUDHI_user_version_target.cmake b/src/cmake/modules/GUDHI_user_version_target.cmake
index a764e88a..8642d3bf 100644
--- a/src/cmake/modules/GUDHI_user_version_target.cmake
+++ b/src/cmake/modules/GUDHI_user_version_target.cmake
@@ -47,7 +47,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11)
   add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
                      copy_directory ${CMAKE_SOURCE_DIR}/src/GudhUI ${GUDHI_USER_VERSION_DIR}/GudhUI)
   
-  set(GUDHI_DIRECTORIES "doc;example;concept")
+  set(GUDHI_DIRECTORIES "doc;example;concept;utilities")
   set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/gudhi_patches")
 
   foreach(GUDHI_MODULE ${GUDHI_MODULES})
-- 
cgit v1.2.3