Bottleneck does not require Eigen3 (C++ and Python)

Doc issue about examples requiring Eigen3



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

Former-commit-id: 5e127d4e8137a44ee3bd688c32653acfb4a55007

3 files changed, 21 insertions, 13 deletions

diff --git a/src/Bottleneck_distance/benchmark/CMakeLists.txt b/src/Bottleneck_distance/benchmark/CMakeLists.txt
index 170081ce..20a4e47b 100644
--- a/src/Bottleneck_distance/benchmark/CMakeLists.txt
+++ b/src/Bottleneck_distance/benchmark/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 project(Bottleneck_distance_benchmark)
 
-if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+if (NOT CGAL_VERSION VERSION_LESS 4.8.1)
   add_executable ( bottleneck_chrono bottleneck_chrono.cpp )
   if (TBB_FOUND)
     target_link_libraries(bottleneck_chrono ${TBB_LIBRARIES})
   endif(TBB_FOUND)
-endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+endif(NOT CGAL_VERSION VERSION_LESS 4.8.1)
diff --git a/src/Bottleneck_distance/example/CMakeLists.txt b/src/Bottleneck_distance/example/CMakeLists.txt
index dc1da31c..eac617db 100644
--- a/src/Bottleneck_distance/example/CMakeLists.txt
+++ b/src/Bottleneck_distance/example/CMakeLists.txt
@@ -1,30 +1,38 @@
 cmake_minimum_required(VERSION 2.6)
 project(Bottleneck_distance_examples)
 
-if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+if (NOT CGAL_VERSION VERSION_LESS 4.8.1)
   add_executable (bottleneck_read_file_example bottleneck_read_file_example.cpp)
   add_executable (bottleneck_basic_example bottleneck_basic_example.cpp)
 
-  add_executable (alpha_rips_persistence_bottleneck_distance alpha_rips_persistence_bottleneck_distance.cpp)
-  target_link_libraries(alpha_rips_persistence_bottleneck_distance ${Boost_PROGRAM_OPTIONS_LIBRARY})
   if (TBB_FOUND)
     target_link_libraries(bottleneck_read_file_example ${TBB_LIBRARIES})
     target_link_libraries(bottleneck_basic_example ${TBB_LIBRARIES})
-    target_link_libraries(alpha_rips_persistence_bottleneck_distance ${TBB_LIBRARIES})
   endif(TBB_FOUND)
 
   add_test(NAME Bottleneck_distance_example_basic COMMAND $<TARGET_FILE:bottleneck_basic_example>)
 
-  add_test(NAME Bottleneck_distance_example_alpha_rips_persistence_bottleneck
-      COMMAND $<TARGET_FILE:alpha_rips_persistence_bottleneck_distance>
-      "${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off" "-r" "0.15" "-m" "0.12" "-d" "3" "-p" "3")
-
   add_test(NAME Bottleneck_read_file_example
       COMMAND $<TARGET_FILE:bottleneck_read_file_example>
       "${CMAKE_SOURCE_DIR}/data/persistence_diagram/first.pers" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/second.pers")
 
   install(TARGETS bottleneck_read_file_example DESTINATION bin)
   install(TARGETS bottleneck_basic_example DESTINATION bin)
-  install(TARGETS alpha_rips_persistence_bottleneck_distance DESTINATION bin)
 
+endif (NOT CGAL_VERSION VERSION_LESS 4.8.1)
+
+# Eigen3 and CGAL > 4.7.0 is required for alpha complex
+# CGAL > 4.8.1 is required for bottleneck distance =>
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+  add_executable (alpha_rips_persistence_bottleneck_distance alpha_rips_persistence_bottleneck_distance.cpp)
+  target_link_libraries(alpha_rips_persistence_bottleneck_distance ${Boost_PROGRAM_OPTIONS_LIBRARY})
+
+  add_test(NAME Bottleneck_distance_example_alpha_rips_persistence_bottleneck
+           COMMAND $<TARGET_FILE:alpha_rips_persistence_bottleneck_distance>
+           "${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off" "-r" "0.15" "-m" "0.12" "-d" "3" "-p" "3")
+
+  install(TARGETS alpha_rips_persistence_bottleneck_distance DESTINATION bin)
+  if (TBB_FOUND)
+    target_link_libraries(alpha_rips_persistence_bottleneck_distance ${TBB_LIBRARIES})
+  endif(TBB_FOUND)
 endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
diff --git a/src/Bottleneck_distance/test/CMakeLists.txt b/src/Bottleneck_distance/test/CMakeLists.txt
index a165d472..2676b82c 100644
--- a/src/Bottleneck_distance/test/CMakeLists.txt
+++ b/src/Bottleneck_distance/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(Bottleneck_distance_tests)
 
-if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+if (NOT CGAL_VERSION VERSION_LESS 4.8.1)
   include(GUDHI_test_coverage)
 
   add_executable ( Bottleneck_distance_test_unit bottleneck_unit_test.cpp )
@@ -12,4 +12,4 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
 
   gudhi_add_coverage_test(Bottleneck_distance_test_unit)
 
-endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+endif (NOT CGAL_VERSION VERSION_LESS 4.8.1)