Merge of branch boost_system_no_deprecated_test in order to :

- remove boost_system library dependency
- repair conda package compilation issues found
- Use Gudhi::Clock instead of boost::date_time library



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

Former-commit-id: d68764ab186bd44f2b2253ba21ad1c0e09584455

4 files changed, 19 insertions, 19 deletions

diff --git a/src/common/example/CMakeLists.txt b/src/common/example/CMakeLists.txt
index af3c2c9d..afe865d4 100644
--- a/src/common/example/CMakeLists.txt
+++ b/src/common/example/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 project(Common_examples)
 
 add_executable ( vector_double_off_reader example_vector_double_points_off_reader.cpp )
-target_link_libraries(vector_double_off_reader  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+target_link_libraries(vector_double_off_reader ${CGAL_LIBRARY})
 add_test(NAME Common_example_vector_double_off_reader COMMAND $<TARGET_FILE:vector_double_off_reader>
     "${CMAKE_SOURCE_DIR}/data/points/SO3_10000.off")
 
@@ -10,18 +10,19 @@ install(TARGETS vector_double_off_reader DESTINATION bin)
 
 if(CGAL_FOUND)
   add_executable ( cgal_3D_off_reader example_CGAL_3D_points_off_reader.cpp )
-  target_link_libraries(cgal_3D_off_reader  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+  target_link_libraries(cgal_3D_off_reader ${CGAL_LIBRARY})
   add_test(NAME Common_example_vector_cgal_3D_off_reader COMMAND $<TARGET_FILE:cgal_3D_off_reader>
       "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off")
 
-  # need CGAL 4.7and Eigen3
+  install(TARGETS cgal_3D_off_reader DESTINATION bin)
+
+  # need CGAL 4.7 and Eigen3
   if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
     add_executable ( cgal_off_reader example_CGAL_points_off_reader.cpp )
-    target_link_libraries(cgal_off_reader  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+    target_link_libraries(cgal_off_reader ${CGAL_LIBRARY})
     add_test(NAME Common_example_vector_cgal_off_reader COMMAND $<TARGET_FILE:cgal_off_reader>
         "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off")
+    install(TARGETS cgal_off_reader DESTINATION bin)
   endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
 
-  install(TARGETS cgal_3D_off_reader DESTINATION bin)
-  install(TARGETS cgal_off_reader DESTINATION bin)
 endif()
diff --git a/src/common/include/gudhi/Clock.h b/src/common/include/gudhi/Clock.h
index 77f196ca..b83de2f5 100644
--- a/src/common/include/gudhi/Clock.h
+++ b/src/common/include/gudhi/Clock.h
@@ -23,9 +23,9 @@
 #ifndef CLOCK_H_
 #define CLOCK_H_
 
-#include <boost/date_time/posix_time/posix_time.hpp>
-
+#include <iostream>
 #include <string>
+#include <chrono>
 
 namespace Gudhi {
 
@@ -33,20 +33,20 @@ class Clock {
  public:
   // Construct and start the timer
   Clock(const std::string& msg_ = std::string())
-      : startTime(boost::posix_time::microsec_clock::local_time()),
+      : startTime(std::chrono::system_clock::now()),
       end_called(false),
       msg(msg_) { }
 
   // Restart the timer
   void begin() const {
     end_called = false;
-    startTime = boost::posix_time::microsec_clock::local_time();
+    startTime = std::chrono::system_clock::now();
   }
 
   // Stop the timer
   void end() const {
     end_called = true;
-    endTime = boost::posix_time::microsec_clock::local_time();
+    endTime = std::chrono::system_clock::now();
   }
 
   std::string message() const {
@@ -62,7 +62,7 @@ class Clock {
     if (!clock.msg.empty())
       stream << clock.msg << ": ";
 
-    stream << clock.num_seconds() << "s";
+    stream << clock.num_seconds() << "s\n";
     return stream;
   }
 
@@ -71,15 +71,15 @@ class Clock {
   // - or now otherwise. In this case, the timer is not stopped.
   double num_seconds() const {
     if (!end_called) {
-      auto end = boost::posix_time::microsec_clock::local_time();
-      return (end - startTime).total_milliseconds() / 1000.;
+      auto end = std::chrono::system_clock::now();
+      return std::chrono::duration_cast<std::chrono::milliseconds>(end-startTime).count() / 1000.;
     } else {
-      return (endTime - startTime).total_milliseconds() / 1000.;
+      return std::chrono::duration_cast<std::chrono::milliseconds>(endTime-startTime).count() / 1000.;
     }
   }
 
  private:
-  mutable boost::posix_time::ptime startTime, endTime;
+  mutable std::chrono::time_point<std::chrono::system_clock> startTime, endTime;
   mutable bool end_called;
   std::string msg;
 };
diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
index c695fbf4..5aa426d7 100644
--- a/src/common/test/CMakeLists.txt
+++ b/src/common/test/CMakeLists.txt
@@ -4,10 +4,10 @@ project(Common_tests)
 include(GUDHI_test_coverage)
 
 add_executable ( Common_test_points_off_reader test_points_off_reader.cpp )
-target_link_libraries(Common_test_points_off_reader ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+target_link_libraries(Common_test_points_off_reader ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 add_executable ( Common_test_distance_matrix_reader test_distance_matrix_reader.cpp )
-target_link_libraries(Common_test_distance_matrix_reader ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+target_link_libraries(Common_test_distance_matrix_reader ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 # Do not forget to copy test files in current binary dir
 file(COPY "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
diff --git a/src/common/utilities/CMakeLists.txt b/src/common/utilities/CMakeLists.txt
index c2e07e7e..b3e4b436 100644
--- a/src/common/utilities/CMakeLists.txt
+++ b/src/common/utilities/CMakeLists.txt
@@ -3,7 +3,6 @@ project(off_file_from_shape_generator)
 
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
   add_executable ( off_file_from_shape_generator off_file_from_shape_generator.cpp )
-  target_link_libraries(off_file_from_shape_generator ${Boost_SYSTEM_LIBRARY})
   add_test(NAME off_file_from_shape_generator_on_sphere_1000_3_15.2 COMMAND $<TARGET_FILE:off_file_from_shape_generator>
       "on" "sphere" "onSphere.off" "1000" "3" "15.2")
   add_test(NAME off_file_from_shape_generator_in_sphere_100_2 COMMAND $<TARGET_FILE:off_file_from_shape_generator>