Add Windows and CGAL_HEADER_ONLY cythonization support

Add OFF reader interfaces (required by Euclidean witness complex)
Add Euclidean_witness_complex



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

Former-commit-id: 4d780f05c3409bea47a81e4377dbaf509b9e718c

1 files changed, 47 insertions, 5 deletions

diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index bcc1e929..efe2005c 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -1,6 +1,19 @@
 cmake_minimum_required(VERSION 2.8)
 project(Cython)
 
+macro( find_the_lib placeholder THE_LIBS )
+  set (THE_LIB_WE_FOUND "NO")
+  foreach(THE_LIB ${THE_LIBS})
+    if(EXISTS ${THE_LIB})
+      get_filename_component(THE_LIB_WE ${THE_LIB} NAME_WE)
+      if (NOT THE_LIB_WE_FOUND)
+        set (THE_LIB_WE_FOUND "YES")
+        set(returnValue "${THE_LIB_WE}")
+      endif(NOT THE_LIB_WE_FOUND)
+    endif(EXISTS ${THE_LIB})
+  endforeach(THE_LIB ${THE_LIBS})
+endmacro( find_the_lib )
+
 FIND_PROGRAM( PYTHON_PATH python )
 FIND_PROGRAM( CYTHON_PATH cython )
 
@@ -13,8 +26,15 @@ if(PYTHON_PATH AND CYTHON_PATH)
 
     set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_RESULT_OF_USE_DECLTYPE', ")
     set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_ALL_NO_LIB', ")
-    set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'boost_system', ")
     set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ")
+    if(WIN32)
+      set( returnValue "" )
+      find_the_lib (${returnValue} ${Boost_SYSTEM_LIBRARY})
+      set(BOOST_SYSTEM_LIB_NAME ${returnValue})
+    else()
+        set(BOOST_SYSTEM_LIB_NAME "boost_system")
+        endif()
+    set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'${BOOST_SYSTEM_LIB_NAME}', ")
 
     # Gudhi and CGAL compilation option
     if(MSVC)
@@ -105,16 +125,38 @@ if(PYTHON_PATH AND CYTHON_PATH)
       file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/doc/alpha_complex_sum.rst")
       file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/doc/alpha_complex_user.rst")
     endif (NOT CGAL_VERSION VERSION_LESS 4.7.0)
+    if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
+      # If CGAL_VERSION >= 4.6.0, include euclidean versions of witness complex
+      set(GUDHI_CYTHON_EUCLIDEAN_WITNESS_COMPLEX
+          "include 'cython/euclidean_witness_complex.pyx'\n")
+    else (NOT CGAL_VERSION VERSION_LESS 4.6.0)
+      # Remove alpha complex unitary tests
+      file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test/test_euclidean_witness_complex.py)
+      file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/doc/euclidean_witness_complex_ref.rst")
+      file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/doc/euclidean_strong_witness_complex_ref.rst")
+    endif (NOT CGAL_VERSION VERSION_LESS 4.6.0)
 
     if(CGAL_FOUND)
       # Add CGAL compilation args
-      set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'CGAL', ")
-      set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ")
+      if(CGAL_HEADER_ONLY)
+        set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ")
+      else(CGAL_HEADER_ONLY)
+        if(WIN32)
+          set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'CGAL-vc140-mt-4.7', ")
+        else(WIN32)
+          set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'CGAL', ")
+        endif(WIN32)
+        set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ")
+      endif(CGAL_HEADER_ONLY)
       # GMP and GMPXX are not required, but if present, CGAL will link with them.
       if(GMP_FOUND)
         set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMP', ")
-        set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'gmp', ")
-        set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ")
+        if(WIN32)
+          set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'libgmp-10', ")
+        else(WIN32)
+          set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'gmp', ")
+        endif(WIN32)
+          set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ")
         if(GMPXX_FOUND)
           set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMPXX', ")
           set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'gmpxx', ")