Alpha complex 3d test was not checking CGAL is 4.11

Rewrite CMakeLists.txt to detect CGAL 4.11 for Alpha complex 3d


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

Former-commit-id: 7ccddf06201760ef4fddc4432a3b208b8b0213f7

1 files changed, 59 insertions, 62 deletions

diff --git a/src/Alpha_complex/utilities/CMakeLists.txt b/src/Alpha_complex/utilities/CMakeLists.txt
index 65ca1624..b12c9690 100644
--- a/src/Alpha_complex/utilities/CMakeLists.txt
+++ b/src/Alpha_complex/utilities/CMakeLists.txt
@@ -1,64 +1,61 @@
 project(Alpha_complex_utilities)
 
-if(CGAL_FOUND)
-  if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
-    add_executable (alpha_complex_persistence alpha_complex_persistence.cpp)
-    target_link_libraries(alpha_complex_persistence ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-
-    if (TBB_FOUND)
-      target_link_libraries(alpha_complex_persistence ${TBB_LIBRARIES})
-    endif(TBB_FOUND)
-    add_test(NAME Alpha_complex_utilities_alpha_complex_persistence COMMAND $<TARGET_FILE:alpha_complex_persistence>
-        "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off" "-p" "2" "-m" "0.45")
-
-    install(TARGETS alpha_complex_persistence DESTINATION bin)
-
-  endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
-
-  if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
-    add_executable(alpha_complex_3d_persistence alpha_complex_3d_persistence.cpp)
-    target_link_libraries(alpha_complex_3d_persistence ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-    if (TBB_FOUND)
-      target_link_libraries(alpha_complex_3d_persistence ${TBB_LIBRARIES})
-    endif(TBB_FOUND)
-
-    add_test(NAME Alpha_complex_utilities_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
-            "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off"
-            "-p" "2" "-m" "0.45" "-o" "alpha.pers")
-
-    add_test(NAME Alpha_complex_utilities_exact_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
-            "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off"
-            "-p" "2" "-m" "0.45" "-o" "exact.pers" "-e")
-
-    add_test(NAME Alpha_complex_utilities_safe_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
-            "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off"
-            "-p" "2" "-m" "0.45" "-o" "safe.pers" "-s")
-
-    if (DIFF_PATH)
-      add_test(Alpha_complex_utilities_diff_alpha_complex_3d ${DIFF_PATH}
-              "exact.pers" "alpha.pers")
-      add_test(Alpha_complex_utilities_diff_alpha_complex_3d ${DIFF_PATH}
-              "safe.pers" "alpha.pers")
-    endif()
-
-    add_test(NAME Alpha_complex_utilities_periodic_alpha_complex_3d_persistence COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
-            "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off"
-            "-c" "${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt"
-            "-p" "2" "-m" "0")
-
-    add_test(NAME Alpha_complex_utilities_weighted_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
-            "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off"
-            "-w" "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.weights"
-            "-p" "2" "-m" "0")
-
-    add_test(NAME Alpha_complex_utilities_weighted_periodic_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
-        "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off"
-        "-w" "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.weights"
-        "-c" "${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt"
-        "-p" "2" "-m" "0" "-e")
-
-    install(TARGETS alpha_complex_3d_persistence DESTINATION bin)
-
-  endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
-
-endif(CGAL_FOUND)
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
+  add_executable (alpha_complex_persistence alpha_complex_persistence.cpp)
+  target_link_libraries(alpha_complex_persistence ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+
+  if (TBB_FOUND)
+    target_link_libraries(alpha_complex_persistence ${TBB_LIBRARIES})
+  endif(TBB_FOUND)
+  add_test(NAME Alpha_complex_utilities_alpha_complex_persistence COMMAND $<TARGET_FILE:alpha_complex_persistence>
+      "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off" "-p" "2" "-m" "0.45")
+
+  install(TARGETS alpha_complex_persistence DESTINATION bin)
+
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
+
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
+  add_executable(alpha_complex_3d_persistence alpha_complex_3d_persistence.cpp)
+  target_link_libraries(alpha_complex_3d_persistence ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+  if (TBB_FOUND)
+    target_link_libraries(alpha_complex_3d_persistence ${TBB_LIBRARIES})
+  endif(TBB_FOUND)
+
+  add_test(NAME Alpha_complex_utilities_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
+          "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off"
+          "-p" "2" "-m" "0.45" "-o" "alpha.pers")
+
+  add_test(NAME Alpha_complex_utilities_exact_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
+          "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off"
+          "-p" "2" "-m" "0.45" "-o" "exact.pers" "-e")
+
+  add_test(NAME Alpha_complex_utilities_safe_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
+          "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off"
+          "-p" "2" "-m" "0.45" "-o" "safe.pers" "-s")
+
+  if (DIFF_PATH)
+    add_test(Alpha_complex_utilities_diff_alpha_complex_3d ${DIFF_PATH}
+            "exact.pers" "alpha.pers")
+    add_test(Alpha_complex_utilities_diff_alpha_complex_3d ${DIFF_PATH}
+            "safe.pers" "alpha.pers")
+  endif()
+
+  add_test(NAME Alpha_complex_utilities_periodic_alpha_complex_3d_persistence COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
+          "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off"
+          "-c" "${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt"
+          "-p" "2" "-m" "0")
+
+  add_test(NAME Alpha_complex_utilities_weighted_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
+          "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off"
+          "-w" "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.weights"
+          "-p" "2" "-m" "0")
+
+  add_test(NAME Alpha_complex_utilities_weighted_periodic_alpha_complex_3d COMMAND $<TARGET_FILE:alpha_complex_3d_persistence>
+      "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.off"
+      "-w" "${CMAKE_SOURCE_DIR}/data/points/grid_10_10_10_in_0_1.weights"
+      "-c" "${CMAKE_SOURCE_DIR}/data/points/iso_cuboid_3_in_0_1.txt"
+      "-p" "2" "-m" "0" "-e")
+
+  install(TARGETS alpha_complex_3d_persistence DESTINATION bin)
+
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)