From c09268a046c43b4311f0f29ac4bfb14dcb2da30d Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 2 Jun 2017 14:10:20 +0000
Subject: Try to remove boost system

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

Former-commit-id: fd12c45af5ebeb72c4b49142abab91b46ce1a9da
---
 src/cython/CMakeLists.txt | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/cython')

diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index d9f356f9..4b56122d 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -6,15 +6,7 @@ if(CYTHON_FOUND)
 
   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_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}', ")
+  set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_SYSTEM_NO_DEPRECATED', ")
 
   # Gudhi and CGAL compilation option
   if(MSVC)
-- 
cgit v1.2.3


From 4adbd857ff2ac187b5dfcfa25c37f32b887ae69b Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 9 Jun 2017 07:48:54 +0000
Subject: No more need of find_the_lib cmake macro to find Windows boost lib
 name Fix cmake warning on if with quotes

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

Former-commit-id: a352820ab0a596961b9851d4a30c40196a70ff98
---
 src/cmake/modules/GUDHI_third_party_libraries.cmake | 13 -------------
 src/cython/CMakeLists.txt                           |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'src/cython')

diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index 5bee774a..b4f3eb52 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -108,19 +108,6 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 message(STATUS "boost include dirs:" ${Boost_INCLUDE_DIRS})
 message(STATUS "boost library dirs:" ${Boost_LIBRARY_DIRS})
 
-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 the correct Python interpreter.
 # Can be set with -DPYTHON_EXECUTABLE=/usr/bin/python3 or -DPython_ADDITIONAL_VERSIONS=3 for instance.
 find_package(Cython)
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index 4b56122d..adcc64e4 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -17,9 +17,9 @@ if(CYTHON_FOUND)
   if(CMAKE_COMPILER_IS_GNUCXX)
     set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-frounding-math', ")
   endif(CMAKE_COMPILER_IS_GNUCXX)
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+  if (CMAKE_CXX_COMPILER_ID MATCHES Intel)
     set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-fp-model strict', ")
-  endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+  endif(CMAKE_CXX_COMPILER_ID MATCHES Intel)
   if (DEBUG_TRACES)
     # For programs to be more verbose
     set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DDEBUG_TRACES', ")
-- 
cgit v1.2.3


From 547a7c9cb50d1818c9412d10cca9655503db625c Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 13 Jun 2017 20:42:51 +0000
Subject: Try to fix Windows compilation for Conda

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

Former-commit-id: afa1b10e300aafbc92a85b3519f4b39add2ae6e4
---
 src/cmake/modules/GUDHI_third_party_libraries.cmake | 4 ++++
 src/cython/CMakeLists.txt                           | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'src/cython')

diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index 8f486118..7cd57b25 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -10,6 +10,10 @@ find_package(GMP)
 if(GMP_FOUND)
   message(STATUS "GMP_LIBRARIES = ${GMP_LIBRARIES}")
   INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
+  get_filename_component(lib_we ${GMP_LIBRARIES} NAME_WE)
+
+  message("++ lib_we = ${lib_we}")
+
   find_package(GMPXX)
   if(GMPXX_FOUND)
     message(STATUS "GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}")
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index adcc64e4..2a0a3844 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -8,6 +8,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', ")
 
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'boost_thread', ")
+  endif()
   # Gudhi and CGAL compilation option
   if(MSVC)
     set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'/fp:strict', ")
-- 
cgit v1.2.3


From f6d8aaaacf4a2802d3aaad6d326f9510fdb2ddf7 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 14 Jun 2017 05:24:01 +0000
Subject: Add traces for debug

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

Former-commit-id: a9e8098443114a4fe6e9c19e6410169580c134c6
---
 src/cmake/modules/GUDHI_third_party_libraries.cmake |  4 ----
 src/cython/CMakeLists.txt                           | 10 ++++++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/cython')

diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index 7cd57b25..8f486118 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -10,10 +10,6 @@ find_package(GMP)
 if(GMP_FOUND)
   message(STATUS "GMP_LIBRARIES = ${GMP_LIBRARIES}")
   INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
-  get_filename_component(lib_we ${GMP_LIBRARIES} NAME_WE)
-
-  message("++ lib_we = ${lib_we}")
-
   find_package(GMPXX)
   if(GMPXX_FOUND)
     message(STATUS "GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}")
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index 2a0a3844..eff36f93 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -8,6 +8,7 @@ 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', ")
   endif()
@@ -106,6 +107,7 @@ 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)
@@ -119,10 +121,14 @@ if(CYTHON_FOUND)
     # 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}'libgmp-10', ")
+        set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'${GMP_LIBRARY_FILE_NAME}', ")
       else(WIN32)
-        set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'gmp', ")
+        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}', ")
       if(GMPXX_FOUND)
-- 
cgit v1.2.3


From e8c3b007c141551b68859ea178e79ddf618c6dca Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 14 Jun 2017 06:38:20 +0000
Subject: 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
---
 src/cython/CMakeLists.txt        | 42 +++++++++++++++++++++-------------------
 src/cython/cythonize_gudhi.py.in |  2 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'src/cython')

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),
 )
-- 
cgit v1.2.3


From 30d31a1aabc2035e23eca7bcf3867a30536f11b7 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 16 Jun 2017 07:06:49 +0000
Subject: Fix Python module version numer Fix link with external libraries

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

Former-commit-id: e2f47e860ea4608a4d298fa4772d750ac540be5a
---
 CMakeGUDHIVersion.txt            | 2 +-
 src/cython/cythonize_gudhi.py.in | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/cython')

diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt
index bd0c57ac..3d9add66 100644
--- a/CMakeGUDHIVersion.txt
+++ b/CMakeGUDHIVersion.txt
@@ -1,6 +1,6 @@
 set (GUDHI_MAJOR_VERSION 2)
 set (GUDHI_MINOR_VERSION 0)
-set (GUDHI_PATCH_VERSION 0)
+set (GUDHI_PATCH_VERSION 1.beta)
 set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION})
 
 message(STATUS "GUDHI version : ${GUDHI_VERSION}")
diff --git a/src/cython/cythonize_gudhi.py.in b/src/cython/cythonize_gudhi.py.in
index cae4641b..68a95916 100644
--- a/src/cython/cythonize_gudhi.py.in
+++ b/src/cython/cythonize_gudhi.py.in
@@ -35,6 +35,7 @@ gudhi = Extension(
     extra_link_args=[@GUDHI_CYTHON_EXTRA_LINK_ARGS@],
     libraries=[@GUDHI_CYTHON_LIBRARIES@],
     library_dirs=[@GUDHI_CYTHON_LIBRARY_DIRS@],
+    runtime_library_dirs=[@GUDHI_CYTHON_LIBRARY_DIRS@],
     include_dirs = [@GUDHI_CYTHON_INCLUDE_DIRS@],
 )
 
-- 
cgit v1.2.3


From 30b44fa282606a6a6b585e0e83b98dae4f2e6b2e Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 16 Jun 2017 08:12:26 +0000
Subject: Add warning about boost_thread link for the Mac GUDHI python module

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

Former-commit-id: 4a9f6c43f4868bd4f303579c22fdc7a54728e68c
---
 src/cython/CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/cython')

diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index 739e1a89..84441591 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -22,6 +22,15 @@ 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', ")
 
+  # TODO: Something more clever could be done.
+  # This is because of https://github.com/CGAL/cgal/blob/master/Installation/include/CGAL/tss.h
+  # CGAL is using boost thread if thread_local is not ready (requires XCode 8 for Mac).
+  # The test in https://github.com/CGAL/cgal/blob/master/Installation/include/CGAL/config.h
+  #   #if __has_feature(cxx_thread_local) || \
+  #       ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
+  #       ( _MSC_VER >= 1900 )
+  #   #define CGAL_CAN_USE_CXX11_THREAD_LOCAL
+  #   #endif
   if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     add_gudhi_cython_lib(${Boost_THREAD_LIBRARY})
     set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ")
-- 
cgit v1.2.3


From 06f595c9bbe1f7fbc1d4e9dae7f5a0a384fe62c2 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 16 Jun 2017 09:27:12 +0000
Subject: Fix CUSTOMBUILD : error : don't know how to set runtime library
 search path for MSVC

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

Former-commit-id: 94c7625b3bc8e943e3856e0e65dc65bb5d8cd0f7
---
 src/cython/CMakeLists.txt        | 8 ++++----
 src/cython/cythonize_gudhi.py.in | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/cython')

diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index 84441591..7586188c 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -170,6 +170,10 @@ if(CYTHON_FOUND)
     set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${TBB_INCLUDE_DIRS}', ")
   endif()
 
+  if(UNIX)
+    set( GUDHI_CYTHON_RUNTIME_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}")
+  endif(UNIX)
+
   # set sphinx-build in make files
   configure_file(doc/Makefile.in "${CMAKE_CURRENT_BINARY_DIR}/doc/Makefile" @ONLY)
   configure_file(doc/make.bat.in "${CMAKE_CURRENT_BINARY_DIR}/doc/make.bat" @ONLY)
@@ -187,10 +191,6 @@ if(CYTHON_FOUND)
   add_custom_target(cython ALL DEPENDS gudhi.so
                     COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests")
 
-  if(UNIX)
-    set( ENV{PYTHONPATH} $ENV{PYTHONPATH}:${CMAKE_CURRENT_BINARY_DIR}/ )
-  endif(UNIX)
-
   # For installation purpose
   # TODO(VR) : files matching pattern mechanism is copying all cython directory
   install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" DESTINATION "${PYTHON_SITE_PACKAGES}/" FILES_MATCHING
diff --git a/src/cython/cythonize_gudhi.py.in b/src/cython/cythonize_gudhi.py.in
index 68a95916..c1a1717a 100644
--- a/src/cython/cythonize_gudhi.py.in
+++ b/src/cython/cythonize_gudhi.py.in
@@ -35,8 +35,8 @@ gudhi = Extension(
     extra_link_args=[@GUDHI_CYTHON_EXTRA_LINK_ARGS@],
     libraries=[@GUDHI_CYTHON_LIBRARIES@],
     library_dirs=[@GUDHI_CYTHON_LIBRARY_DIRS@],
-    runtime_library_dirs=[@GUDHI_CYTHON_LIBRARY_DIRS@],
     include_dirs = [@GUDHI_CYTHON_INCLUDE_DIRS@],
+    runtime_library_dirs=[@GUDHI_CYTHON_RUNTIME_LIBRARY_DIRS@],
 )
 
 setup(
-- 
cgit v1.2.3