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

4 files changed, 9 insertions, 15 deletions

diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index 4badcb91..5bf553e9 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -5,9 +5,9 @@ project(Alpha_complex_examples)
 # cmake -DCGAL_DIR=~/workspace/CGAL-4.7 ..
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
   add_executable ( Alpha_complex_example_from_points Alpha_complex_from_points.cpp )
-  target_link_libraries(Alpha_complex_example_from_points  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY})
+  target_link_libraries(Alpha_complex_example_from_points  ${CGAL_LIBRARY})
   add_executable ( Alpha_complex_example_from_off Alpha_complex_from_off.cpp )
-  target_link_libraries(Alpha_complex_example_from_off  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY})
+  target_link_libraries(Alpha_complex_example_from_off ${CGAL_LIBRARY})
   if (TBB_FOUND)
     target_link_libraries(Alpha_complex_example_from_points ${TBB_LIBRARIES})
     target_link_libraries(Alpha_complex_example_from_off ${TBB_LIBRARIES})
diff --git a/src/Rips_complex/example/CMakeLists.txt b/src/Rips_complex/example/CMakeLists.txt
index 712db16e..d2d3e052 100644
--- a/src/Rips_complex/example/CMakeLists.txt
+++ b/src/Rips_complex/example/CMakeLists.txt
@@ -3,17 +3,17 @@ project(Rips_complex_examples)
 
 # Point cloud
 add_executable ( Rips_complex_example_from_off example_rips_complex_from_off_file.cpp )
-target_link_libraries(Rips_complex_example_from_off  ${Boost_SYSTEM_LIBRARY})
+#target_link_libraries(Rips_complex_example_from_off  ${Boost_SYSTEM_LIBRARY})
 
 add_executable ( Rips_complex_example_one_skeleton_from_points example_one_skeleton_rips_from_points.cpp )
-target_link_libraries(Rips_complex_example_one_skeleton_from_points  ${Boost_SYSTEM_LIBRARY})
+#target_link_libraries(Rips_complex_example_one_skeleton_from_points  ${Boost_SYSTEM_LIBRARY})
 
 # Distance matrix
 add_executable ( Rips_complex_example_one_skeleton_from_distance_matrix example_one_skeleton_rips_from_distance_matrix.cpp )
-target_link_libraries(Rips_complex_example_one_skeleton_from_distance_matrix  ${Boost_SYSTEM_LIBRARY})
+#target_link_libraries(Rips_complex_example_one_skeleton_from_distance_matrix  ${Boost_SYSTEM_LIBRARY})
 
 add_executable ( Rips_complex_example_from_csv_distance_matrix example_rips_complex_from_csv_distance_matrix_file.cpp )
-target_link_libraries(Rips_complex_example_from_csv_distance_matrix  ${Boost_SYSTEM_LIBRARY})
+#target_link_libraries(Rips_complex_example_from_csv_distance_matrix  ${Boost_SYSTEM_LIBRARY})
 
 if (TBB_FOUND)
   target_link_libraries(Rips_complex_example_from_off ${TBB_LIBRARIES})
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake
index 8cb01d3c..7b0cda3b 100644
--- a/src/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -99,6 +99,8 @@ add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
 add_definitions(-DBOOST_ALL_NO_LIB)
 # problem with Visual Studio link on Boost program_options
 add_definitions( -DBOOST_ALL_DYN_LINK )
+# problem on Mac with boost_system and boost_thread
+#add_definitions( -DBOOST_SYSTEM_NO_DEPRECATED )
 
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
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)