Fix try

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

Former-commit-id: da6eb0ef7b79c0d21d8e98d17d78459d1768a5db

2 files changed, 23 insertions, 21 deletions

diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index eff36f93..739e1a89 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -1,6 +1,20 @@
 cmake_minimum_required(VERSION 2.8)
 project(Cython)
 
+function( add_gudhi_cython_lib THE_LIB )
+  if(EXISTS ${THE_LIB})
+    get_filename_component(THE_LIB_FILE_NAME ${THE_LIB} NAME_WE)
+    if(WIN32)
+      message("++ ${THE_LIB} => THE_LIB_FILE_NAME = ${THE_LIB_FILE_NAME}")
+      set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'${THE_LIB_FILE_NAME}', " PARENT_SCOPE)
+    else(WIN32)
+      STRING(REGEX REPLACE "lib" "" UNIX_LIB_FILE_NAME ${THE_LIB_FILE_NAME})
+      message("++ ${THE_LIB} => UNIX_LIB_FILE_NAME = ${UNIX_LIB_FILE_NAME}")
+      set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'${UNIX_LIB_FILE_NAME}', " PARENT_SCOPE)
+    endif(WIN32)
+  endif(EXISTS ${THE_LIB})
+endfunction( add_gudhi_cython_lib )
+
 if(CYTHON_FOUND)
   message("++ ${PYTHON_EXECUTABLE} v.${PYTHON_VERSION_STRING} - Cython is ${CYTHON_EXECUTABLE} - py.test is ${PYTEST_PATH} - Sphinx is ${SPHINX_PATH}")
 
@@ -8,9 +22,9 @@ if(CYTHON_FOUND)
   set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_ALL_NO_LIB', ")
   set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_SYSTEM_NO_DEPRECATED', ")
 
-  message("++ Boost_THREAD_LIBRARY=${Boost_THREAD_LIBRARY} - Boost_thread_LIBRARY=${Boost_thread_LIBRARY} - ")
   if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'boost_thread', ")
+    add_gudhi_cython_lib(${Boost_THREAD_LIBRARY})
+    set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ")
   endif()
   # Gudhi and CGAL compilation option
   if(MSVC)
@@ -107,33 +121,20 @@ if(CYTHON_FOUND)
 
   if(CGAL_FOUND)
     # Add CGAL compilation args
-    message("++ CGAL_LIBRARIES = ${CGAL_LIBRARIES}")
     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)
+      add_gudhi_cython_lib(${CGAL_LIBRARIES})
       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', ")
-      get_filename_component(GMP_LIBRARY_FILE_NAME ${GMP_LIBRARIES} NAME_WE)
-      message("++ GMP_LIBRARY_FILE_NAME = ${GMP_LIBRARY_FILE_NAME}")
-      if(WIN32)
-        set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'${GMP_LIBRARY_FILE_NAME}', ")
-      else(WIN32)
-        STRING(REGEX REPLACE "lib" "" UNIX_GMP_LIBRARY_FILE_NAME ${GMP_LIBRARY_FILE_NAME})
-        message("++ UNIX_GMP_LIBRARY_FILE_NAME = ${UNIX_GMP_LIBRARY_FILE_NAME}")
-        set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'${UNIX_GMP_LIBRARY_FILE_NAME}', ")
-      endif(WIN32)
-        set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ")
+      add_gudhi_cython_lib(${GMP_LIBRARIES})
+      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', ")
+        add_gudhi_cython_lib(${GMPXX_LIBRARIES})
         set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMPXX_LIBRARIES_DIR}', ")
       endif(GMPXX_FOUND)
     endif(GMP_FOUND)
@@ -154,7 +155,8 @@ if(CYTHON_FOUND)
 
   if (TBB_FOUND)
     set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DGUDHI_USE_TBB', ")
-    set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'tbb', 'tbbmalloc', ")
+    add_gudhi_cython_lib(${TBB_RELEASE_LIBRARY})
+    add_gudhi_cython_lib(${TBB_MALLOC_RELEASE_LIBRARY})
     set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${TBB_LIBRARY_DIRS}', ")
     set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${TBB_INCLUDE_DIRS}', ")
   endif()
diff --git a/src/cython/cythonize_gudhi.py.in b/src/cython/cythonize_gudhi.py.in
index 5a97e9f3..cae4641b 100644
--- a/src/cython/cythonize_gudhi.py.in
+++ b/src/cython/cythonize_gudhi.py.in
@@ -42,7 +42,7 @@ setup(
     name = 'gudhi',
     author='Vincent Rouvreau',
     author_email='gudhi-contact@lists.gforge.inria.fr',
-    version='0.1.0',
+    version='@GUDHI_VERSION@',
     url='http://gudhi.gforge.inria.fr/',
     ext_modules = cythonize(gudhi),
 )