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

3 files changed, 110 insertions, 114 deletions

diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index 1f127972..c62a220c 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -1,51 +1,48 @@
 project(Alpha_complex_examples)
 
-if(CGAL_FOUND)
-  # need CGAL 4.7
-  # cmake -DCGAL_DIR=~/workspace/CGAL-4.7 ..
-  if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
-    add_executable ( Alpha_complex_example_from_points Alpha_complex_from_points.cpp )
-    target_link_libraries(Alpha_complex_example_from_points  ${CGAL_LIBRARY})
-    add_executable ( Alpha_complex_example_from_off Alpha_complex_from_off.cpp )
-    target_link_libraries(Alpha_complex_example_from_off ${CGAL_LIBRARY})
-    if (TBB_FOUND)
-      target_link_libraries(Alpha_complex_example_from_points ${TBB_LIBRARIES})
-      target_link_libraries(Alpha_complex_example_from_off ${TBB_LIBRARIES})
-    endif()
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
+  add_executable ( Alpha_complex_example_from_points Alpha_complex_from_points.cpp )
+  target_link_libraries(Alpha_complex_example_from_points  ${CGAL_LIBRARY})
+  add_executable ( Alpha_complex_example_from_off Alpha_complex_from_off.cpp )
+  target_link_libraries(Alpha_complex_example_from_off ${CGAL_LIBRARY})
+  if (TBB_FOUND)
+    target_link_libraries(Alpha_complex_example_from_points ${TBB_LIBRARIES})
+    target_link_libraries(Alpha_complex_example_from_off ${TBB_LIBRARIES})
+  endif()
 
-    add_test(NAME Alpha_complex_example_from_points COMMAND $<TARGET_FILE:Alpha_complex_example_from_points>)
+  add_test(NAME Alpha_complex_example_from_points COMMAND $<TARGET_FILE:Alpha_complex_example_from_points>)
 
-    add_test(NAME Alpha_complex_example_from_off_60 COMMAND $<TARGET_FILE:Alpha_complex_example_from_off>
-        "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "60.0" "${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt")
-    add_test(NAME Alpha_complex_example_from_off_32 COMMAND $<TARGET_FILE:Alpha_complex_example_from_off>
-        "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "32.0" "${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt")
-    if (DIFF_PATH)
-      # Do not forget to copy test results files in current binary dir
-      file(COPY "alphaoffreader_for_doc_32.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-      file(COPY "alphaoffreader_for_doc_60.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+  add_test(NAME Alpha_complex_example_from_off_60 COMMAND $<TARGET_FILE:Alpha_complex_example_from_off>
+      "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "60.0" "${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt")
+  add_test(NAME Alpha_complex_example_from_off_32 COMMAND $<TARGET_FILE:Alpha_complex_example_from_off>
+      "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "32.0" "${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt")
+  if (DIFF_PATH)
+    # Do not forget to copy test results files in current binary dir
+    file(COPY "alphaoffreader_for_doc_32.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+    file(COPY "alphaoffreader_for_doc_60.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 
-      add_test(Alpha_complex_example_from_off_60_diff_files ${DIFF_PATH}
-          ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_60.txt)
-      add_test(Alpha_complex_example_from_off_32_diff_files ${DIFF_PATH}
-          ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_32.txt)
-    endif()
-  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_example_weighted_3d_from_points Weighted_alpha_complex_3d_from_points.cpp )
-    target_link_libraries(Alpha_complex_example_weighted_3d_from_points  ${CGAL_LIBRARY})
-    if (TBB_FOUND)
-      target_link_libraries(Alpha_complex_example_weighted_3d_from_points ${TBB_LIBRARIES})
-    endif()
-    add_test(NAME Alpha_complex_example_weighted_3d_from_points
-            COMMAND $<TARGET_FILE:Alpha_complex_example_weighted_3d_from_points>)
+    add_test(Alpha_complex_example_from_off_60_diff_files ${DIFF_PATH}
+        ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_60.txt)
+    add_test(Alpha_complex_example_from_off_32_diff_files ${DIFF_PATH}
+        ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_32.txt)
+  endif()
+endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
 
-    add_executable ( Alpha_complex_example_3d_from_points Alpha_complex_3d_from_points.cpp )
-    target_link_libraries(Alpha_complex_example_3d_from_points  ${CGAL_LIBRARY})
-    if (TBB_FOUND)
-      target_link_libraries(Alpha_complex_example_3d_from_points ${TBB_LIBRARIES})
-    endif()
-    add_test(NAME Alpha_complex_example_3d_from_points
-            COMMAND $<TARGET_FILE:Alpha_complex_example_3d_from_points>)
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
+  add_executable ( Alpha_complex_example_weighted_3d_from_points Weighted_alpha_complex_3d_from_points.cpp )
+  target_link_libraries(Alpha_complex_example_weighted_3d_from_points  ${CGAL_LIBRARY})
+  if (TBB_FOUND)
+    target_link_libraries(Alpha_complex_example_weighted_3d_from_points ${TBB_LIBRARIES})
+  endif()
+  add_test(NAME Alpha_complex_example_weighted_3d_from_points
+          COMMAND $<TARGET_FILE:Alpha_complex_example_weighted_3d_from_points>)
 
-  endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
-endif()
\ No newline at end of file
+  add_executable ( Alpha_complex_example_3d_from_points Alpha_complex_3d_from_points.cpp )
+  target_link_libraries(Alpha_complex_example_3d_from_points  ${CGAL_LIBRARY})
+  if (TBB_FOUND)
+    target_link_libraries(Alpha_complex_example_3d_from_points ${TBB_LIBRARIES})
+  endif()
+  add_test(NAME Alpha_complex_example_3d_from_points
+          COMMAND $<TARGET_FILE:Alpha_complex_example_3d_from_points>)
+
+endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
diff --git a/src/Alpha_complex/test/CMakeLists.txt b/src/Alpha_complex/test/CMakeLists.txt
index 61a9e6b5..380380f4 100644
--- a/src/Alpha_complex/test/CMakeLists.txt
+++ b/src/Alpha_complex/test/CMakeLists.txt
@@ -1,7 +1,10 @@
 project(Alpha_complex_tests)
 
+include(GUDHI_test_coverage)
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
-  include(GUDHI_test_coverage)
+
+  # 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}/)
 
   add_executable ( Alpha_complex_test_unit Alpha_complex_unit_test.cpp )
   target_link_libraries(Alpha_complex_test_unit ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
@@ -9,18 +12,17 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
     target_link_libraries(Alpha_complex_test_unit ${TBB_LIBRARIES})
   endif()
 
+  gudhi_add_coverage_test(Alpha_complex_test_unit)
+
+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_test_unit Alpha_complex_3d_unit_test.cpp )
   target_link_libraries(Alpha_complex_3d_test_unit ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
   if (TBB_FOUND)
     target_link_libraries(Alpha_complex_3d_test_unit ${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}/)
-  file(COPY "${CMAKE_SOURCE_DIR}/data/points/grid_5_5_5_in_0_1.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-
-  gudhi_add_coverage_test(Alpha_complex_test_unit)
   gudhi_add_coverage_test(Alpha_complex_3d_test_unit)
 
-endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
-
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
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)