Merge cgal_4.8_issue branch into the trunk

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

Former-commit-id: 094b70b4141e7456651263b1619240aff6a5d562

2 files changed, 41 insertions, 49 deletions

diff --git a/src/Witness_complex/example/CMakeLists.txt b/src/Witness_complex/example/CMakeLists.txt
index 9990c541..549a85be 100644
--- a/src/Witness_complex/example/CMakeLists.txt
+++ b/src/Witness_complex/example/CMakeLists.txt
@@ -9,40 +9,36 @@ endif()
 add_test(Witness_complex_test_nearest_landmark_table Witness_complex_example_nearest_landmark_table)
 
 # CGAL and Eigen3 are required for Euclidean version of Witness
-if(CGAL_FOUND)
-  if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
-    if (EIGEN3_FOUND)
-      add_executable( Witness_complex_example_off example_witness_complex_off.cpp )
-      target_link_libraries(Witness_complex_example_off ${Boost_SYSTEM_LIBRARY})
-      add_executable( Witness_complex_example_strong_off example_strong_witness_complex_off.cpp )
-      target_link_libraries(Witness_complex_example_strong_off ${Boost_SYSTEM_LIBRARY})
-      add_executable ( Witness_complex_example_sphere example_witness_complex_sphere.cpp )
-      target_link_libraries(Witness_complex_example_sphere ${Boost_SYSTEM_LIBRARY})
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
+  add_executable( Witness_complex_example_off example_witness_complex_off.cpp )
+  target_link_libraries(Witness_complex_example_off ${Boost_SYSTEM_LIBRARY})
+  add_executable( Witness_complex_example_strong_off example_strong_witness_complex_off.cpp )
+  target_link_libraries(Witness_complex_example_strong_off ${Boost_SYSTEM_LIBRARY})
+  add_executable ( Witness_complex_example_sphere example_witness_complex_sphere.cpp )
+  target_link_libraries(Witness_complex_example_sphere ${Boost_SYSTEM_LIBRARY})
 
-      add_executable ( Witness_complex_example_witness_persistence example_witness_complex_persistence.cpp )
-      target_link_libraries(Witness_complex_example_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+  add_executable ( Witness_complex_example_witness_persistence example_witness_complex_persistence.cpp )
+  target_link_libraries(Witness_complex_example_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
-      add_executable ( Witness_complex_example_strong_witness_persistence example_strong_witness_persistence.cpp )
-      target_link_libraries(Witness_complex_example_strong_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+  add_executable ( Witness_complex_example_strong_witness_persistence example_strong_witness_persistence.cpp )
+  target_link_libraries(Witness_complex_example_strong_witness_persistence ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
 
-      if (TBB_FOUND)
-        target_link_libraries(Witness_complex_example_witness_persistence ${TBB_LIBRARIES})
-        target_link_libraries(Witness_complex_example_strong_witness_persistence ${TBB_LIBRARIES})
-      endif()
+  if (TBB_FOUND)
+    target_link_libraries(Witness_complex_example_witness_persistence ${TBB_LIBRARIES})
+    target_link_libraries(Witness_complex_example_strong_witness_persistence ${TBB_LIBRARIES})
+  endif()
 
-      add_test(Witness_complex_off_test_torus
-               ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_off
-               ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off 20 1.0 3)
-      add_test(Witness_complex_strong_off_test_torus
-               ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_off
-               ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off 20 1.0 3)
-      add_test(Witness_complex_test_sphere_10 Witness_complex_example_sphere 10)
-      add_test(Witness_complex_test_torus_persistence
-               ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_witness_persistence
-               ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5)
-      add_test(Witness_complex_strong_test_torus_persistence
-               ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_witness_persistence
-               ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5)
-    endif(EIGEN3_FOUND)
-  endif (NOT CGAL_VERSION VERSION_LESS 4.6.0)
-endif()
+  add_test(Witness_complex_off_test_torus
+           ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_off
+           ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off 20 1.0 3)
+  add_test(Witness_complex_strong_off_test_torus
+           ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_off
+           ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off 20 1.0 3)
+  add_test(Witness_complex_test_sphere_10 Witness_complex_example_sphere 10)
+  add_test(Witness_complex_test_torus_persistence
+           ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_witness_persistence
+           ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5)
+  add_test(Witness_complex_strong_test_torus_persistence
+           ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_witness_persistence
+           ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5)
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
diff --git a/src/Witness_complex/test/CMakeLists.txt b/src/Witness_complex/test/CMakeLists.txt
index 12b3be56..e73f9c3a 100644
--- a/src/Witness_complex/test/CMakeLists.txt
+++ b/src/Witness_complex/test/CMakeLists.txt
@@ -23,20 +23,16 @@ add_test(NAME simple_witness_complex
     --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Witness_complex_test_simple_witness_complexUT.xml --log_level=test_suite --report_level=no)
 
 # CGAL and Eigen3 are required for Euclidean version of Witness
-if(CGAL_FOUND)
-  if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
-    if (EIGEN3_FOUND)
-      add_executable ( Witness_complex_test_euclidean_simple_witness_complex test_euclidean_simple_witness_complex.cpp )
-      target_link_libraries(Witness_complex_test_euclidean_simple_witness_complex ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-      if (TBB_FOUND)
-        target_link_libraries(Witness_complex_test_euclidean_simple_witness_complex ${TBB_LIBRARIES})
-      endif(TBB_FOUND)
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
+  add_executable ( Witness_complex_test_euclidean_simple_witness_complex test_euclidean_simple_witness_complex.cpp )
+  target_link_libraries(Witness_complex_test_euclidean_simple_witness_complex ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  if (TBB_FOUND)
+    target_link_libraries(Witness_complex_test_euclidean_simple_witness_complex ${TBB_LIBRARIES})
+  endif(TBB_FOUND)
 
-      # Unitary tests definition and xml result file generation
-      add_test(NAME euclidean_simple_witness_complex
-        COMMAND ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_test_euclidean_simple_witness_complex
-          # XML format for Jenkins xUnit plugin
-          --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Witness_complex_test_euclidean_simple_witness_complexUT.xml --log_level=test_suite --report_level=no)
-    endif(EIGEN3_FOUND)
-  endif (NOT CGAL_VERSION VERSION_LESS 4.6.0)
-endif()
+  # Unitary tests definition and xml result file generation
+  add_test(NAME euclidean_simple_witness_complex
+    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_test_euclidean_simple_witness_complex
+      # XML format for Jenkins xUnit plugin
+      --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Witness_complex_test_euclidean_simple_witness_complexUT.xml --log_level=test_suite --report_level=no)
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)