Fix doxygen warning

CMake message fix
CMake test tangential examples


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

Former-commit-id: efa3c76e767d6ba55367b57c10ab87844c968457

4 files changed, 21 insertions, 42 deletions

diff --git a/src/Simplex_tree/doc/Intro_simplex_tree.h b/src/Simplex_tree/doc/Intro_simplex_tree.h
index be061785..940dd694 100644
--- a/src/Simplex_tree/doc/Intro_simplex_tree.h
+++ b/src/Simplex_tree/doc/Intro_simplex_tree.h
@@ -66,8 +66,8 @@ Expand the simplex tree in 3.8e-05 s.
 Information of the Simplex Tree: 
 Number of vertices = 10   Number of simplices = 98 \endcode
  * 
- * \li <a href="_simplex_tree_2simplex_tree_from_alpha_shapes_3_8cpp-example.html">
- * Simplex_tree/simplex_tree_from_alpha_shapes_3.cpp</a> - Simplex tree is computed and displayed from a 3D alpha
+ * \li <a href="_simplex_tree_2example_alpha_shapes_3_simplex_tree_from_off_file_8cpp-example.html">
+ * Simplex_tree/example_alpha_shapes_3_simplex_tree_from_off_file.cpp</a> - Simplex tree is computed and displayed from a 3D alpha
  * complex (Requires CGAL, GMP and GMPXX to be installed)
  * 
  * 
diff --git a/src/Tangential_complex/benchmark/CMakeLists.txt b/src/Tangential_complex/benchmark/CMakeLists.txt
index 12488201..a217d6e6 100644
--- a/src/Tangential_complex/benchmark/CMakeLists.txt
+++ b/src/Tangential_complex/benchmark/CMakeLists.txt
@@ -13,28 +13,14 @@ endif()
 # need CGAL 4.8
 if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.8.0)
-    message(STATUS "CGAL version: ${CGAL_VERSION}.")
-
-    find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
-      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-      include( ${EIGEN3_USE_FILE} )
-
       add_executable(Tangential_complex_benchmark benchmark_tc.cpp)
       target_link_libraries(Tangential_complex_benchmark 
 		${Boost_DATE_TIME_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
       if (TBB_FOUND)
         target_link_libraries(Tangential_complex_benchmark ${TBB_LIBRARIES})
-      endif()
-
-      # 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}/)
-
-    else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Tangential complex feature.")
-    endif()
-  else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Tangential complex feature. Version 4.8.0 is required.")
-  endif ()
-endif()
+      endif(TBB_FOUND)
+    endif(EIGEN3_FOUND)
+  endif (NOT CGAL_VERSION VERSION_LESS 4.8.0)
+endif(CGAL_FOUND)
 
diff --git a/src/Tangential_complex/example/CMakeLists.txt b/src/Tangential_complex/example/CMakeLists.txt
index 7ba043f0..a75ccd5b 100644
--- a/src/Tangential_complex/example/CMakeLists.txt
+++ b/src/Tangential_complex/example/CMakeLists.txt
@@ -3,14 +3,7 @@ project(Tangential_complex_examples)
 
 if(CGAL_FOUND)
   if (NOT CGAL_VERSION VERSION_LESS 4.8.0)
-    message(STATUS "CGAL version: ${CGAL_VERSION}.")
-
-    find_package(Eigen3 3.1.0)
     if (EIGEN3_FOUND)
-      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-      include( ${EIGEN3_USE_FILE} )
-      include_directories (BEFORE "../../include")
-
       add_executable( Tangential_complex_example_basic example_basic.cpp )
       target_link_libraries(Tangential_complex_example_basic ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
       add_executable( Tangential_complex_example_with_perturb example_with_perturb.cpp )
@@ -18,13 +11,13 @@ if(CGAL_FOUND)
       if (TBB_FOUND)
         target_link_libraries(Tangential_complex_example_basic ${TBB_LIBRARIES})
         target_link_libraries(Tangential_complex_example_with_perturb ${TBB_LIBRARIES})
-      endif()
-    else()
-      message(WARNING "Eigen3 not found. Version 3.1.0 is required for the Tangential_complex examples.")
-    endif()
-  else()
-    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Tangential_complex examples. Version 4.8.0 is required.")
-  endif ()
-else()
-  message(WARNING "CGAL not found. It is required for the Tangential_complex examples.")
-endif()
+      endif(TBB_FOUND)
+
+      add_test(Tangential_complex_example_basic
+               ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_example_basic)
+
+      add_test(Tangential_complex_example_with_perturb
+               ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_example_with_perturb)
+    endif(EIGEN3_FOUND)
+  endif(NOT CGAL_VERSION VERSION_LESS 4.8.0)
+endif(CGAL_FOUND)
diff --git a/src/common/doc/main_page.h b/src/common/doc/main_page.h
index fe23c4e7..1a2cb6ba 100644
--- a/src/common/doc/main_page.h
+++ b/src/common/doc/main_page.h
@@ -220,8 +220,8 @@ make \endverbatim
  * Library</a> (CGAL \cite cgal:eb-15b) and will not be built if CGAL is not installed:
  * \li <a href="_persistent_cohomology_2alpha_complex_3d_persistence_8cpp-example.html">
  * Persistent_cohomology/alpha_complex_3d_persistence.cpp</a>
- * \li <a href="_simplex_tree_2simplex_tree_from_alpha_shapes_3_8cpp-example.html">
- * Simplex_tree/simplex_tree_from_alpha_shapes_3.cpp</a>
+ * \li <a href="_simplex_tree_2example_alpha_shapes_3_simplex_tree_from_off_file_8cpp-example.html">
+ * Simplex_tree/example_alpha_shapes_3_simplex_tree_from_off_file.cpp</a>
  * 
  * The following example requires CGAL version &ge; 4.6:
  * \li <a href="_witness_complex_2witness_complex_sphere_8cpp-example.html">
@@ -281,8 +281,8 @@ make \endverbatim
  * Persistent_cohomology/alpha_complex_persistence.cpp</a>
  * \li <a href="_simplex_tree_2simple_simplex_tree_8cpp-example.html">
  * Simplex_tree/simple_simplex_tree.cpp</a>
- * \li <a href="_simplex_tree_2simplex_tree_from_alpha_shapes_3_8cpp-example.html">
- * Simplex_tree/simplex_tree_from_alpha_shapes_3.cpp</a>
+ * \li <a href="_simplex_tree_2example_alpha_shapes_3_simplex_tree_from_off_file_8cpp-example.html">
+ * Simplex_tree/example_alpha_shapes_3_simplex_tree_from_off_file.cpp</a>
  * \li <a href="_simplex_tree_2simplex_tree_from_cliques_of_graph_8cpp-example.html">
  * Simplex_tree/simplex_tree_from_cliques_of_graph.cpp</a>
  * \li <a href="_persistent_cohomology_2alpha_complex_3d_persistence_8cpp-example.html">
@@ -351,7 +351,7 @@ make \endverbatim
  * @example Persistent_cohomology/custom_persistence_sort.cpp
  * @example Simplex_tree/mini_simplex_tree.cpp
  * @example Simplex_tree/simple_simplex_tree.cpp
- * @example Simplex_tree/simplex_tree_from_alpha_shapes_3.cpp
+ * @example Simplex_tree/example_alpha_shapes_3_simplex_tree_from_off_file.cpp
  * @example Simplex_tree/simplex_tree_from_cliques_of_graph.cpp
  * @example Skeleton_blocker/Skeleton_blocker_from_simplices.cpp
  * @example Skeleton_blocker/Skeleton_blocker_iteration.cpp