merge from trunk

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

Former-commit-id: 7d261d59dae839dd5de8f6a03c5a167d015f7d85

2 files changed, 30 insertions, 38 deletions

diff --git a/src/Subsampling/example/CMakeLists.txt b/src/Subsampling/example/CMakeLists.txt
index 0fd3335c..bb043297 100644
--- a/src/Subsampling/example/CMakeLists.txt
+++ b/src/Subsampling/example/CMakeLists.txt
@@ -1,21 +1,17 @@
 cmake_minimum_required(VERSION 2.6)
 project(Subsampling_examples)
 
-if(CGAL_FOUND)
-  if (NOT CGAL_VERSION VERSION_LESS 4.8.1)
-    if (EIGEN3_FOUND)
-      add_executable(Subsampling_example_pick_n_random_points example_pick_n_random_points.cpp)
-      add_executable(Subsampling_example_choose_n_farthest_points example_choose_n_farthest_points.cpp)
-      add_executable(Subsampling_example_custom_kernel example_custom_kernel.cpp)
-      add_executable(Subsampling_example_sparsify_point_set example_sparsify_point_set.cpp)
-      target_link_libraries(Subsampling_example_sparsify_point_set ${CGAL_LIBRARY})
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+  add_executable(Subsampling_example_pick_n_random_points example_pick_n_random_points.cpp)
+  add_executable(Subsampling_example_choose_n_farthest_points example_choose_n_farthest_points.cpp)
+  add_executable(Subsampling_example_custom_kernel example_custom_kernel.cpp)
+  add_executable(Subsampling_example_sparsify_point_set example_sparsify_point_set.cpp)
+  target_link_libraries(Subsampling_example_sparsify_point_set ${CGAL_LIBRARY})
 
-      add_test(Subsampling_example_pick_n_random_points
-               ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_pick_n_random_points)
-      add_test(Subsampling_example_choose_n_farthest_points
-               ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_choose_n_farthest_points)
-      add_test(Subsampling_example_sparsify_point_set
-               ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_sparsify_point_set)
-    endif()
-  endif ()
-endif()
+  add_test(Subsampling_example_pick_n_random_points
+           ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_pick_n_random_points)
+  add_test(Subsampling_example_choose_n_farthest_points
+           ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_choose_n_farthest_points)
+  add_test(Subsampling_example_sparsify_point_set
+           ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_sparsify_point_set)
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
diff --git a/src/Subsampling/test/CMakeLists.txt b/src/Subsampling/test/CMakeLists.txt
index 3a2fb649..5517fe9d 100644
--- a/src/Subsampling/test/CMakeLists.txt
+++ b/src/Subsampling/test/CMakeLists.txt
@@ -10,29 +10,25 @@ if (GPROF_PATH)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
 endif()
 
-if(CGAL_FOUND)
-  if (NOT CGAL_VERSION VERSION_LESS 4.8.1)
-    if (EIGEN3_FOUND)
-      add_executable( Subsampling_test_pick_n_random_points test_pick_n_random_points.cpp )
-      target_link_libraries(Subsampling_test_pick_n_random_points ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+  add_executable( Subsampling_test_pick_n_random_points test_pick_n_random_points.cpp )
+  target_link_libraries(Subsampling_test_pick_n_random_points ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
-      add_executable( Subsampling_test_choose_n_farthest_points test_choose_n_farthest_points.cpp )
-      target_link_libraries(Subsampling_test_choose_n_farthest_points ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  add_executable( Subsampling_test_choose_n_farthest_points test_choose_n_farthest_points.cpp )
+  target_link_libraries(Subsampling_test_choose_n_farthest_points ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
-      add_executable(Subsampling_test_sparsify_point_set test_sparsify_point_set.cpp)
-      target_link_libraries(Subsampling_test_sparsify_point_set ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  add_executable(Subsampling_test_sparsify_point_set test_sparsify_point_set.cpp)
+  target_link_libraries(Subsampling_test_sparsify_point_set ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
-      add_test(Subsampling_test_pick_n_random_points ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_pick_n_random_points
-      # XML format for Jenkins xUnit plugin 
-      --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_pick_n_random_points_UT.xml --log_level=test_suite --report_level=no)
+  add_test(Subsampling_test_pick_n_random_points ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_pick_n_random_points
+  # XML format for Jenkins xUnit plugin
+  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_pick_n_random_points_UT.xml --log_level=test_suite --report_level=no)
 
-      add_test(Subsampling_test_choose_n_farthest_points ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_choose_n_farthest_points
-      # XML format for Jenkins xUnit plugin 
-      --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_choose_n_farthest_points_UT.xml --log_level=test_suite --report_level=no)
+  add_test(Subsampling_test_choose_n_farthest_points ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_choose_n_farthest_points
+  # XML format for Jenkins xUnit plugin
+  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_choose_n_farthest_points_UT.xml --log_level=test_suite --report_level=no)
 
-      add_test(Subsampling_test_sparsify_point_set ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_sparsify_point_set
-      # XML format for Jenkins xUnit plugin 
-      --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_sparsify_point_set_UT.xml --log_level=test_suite --report_level=no)
-    endif()
-  endif ()
-endif()
+  add_test(Subsampling_test_sparsify_point_set ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_sparsify_point_set
+  # XML format for Jenkins xUnit plugin
+  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_sparsify_point_set_UT.xml --log_level=test_suite --report_level=no)
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)