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, 41 insertions, 44 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)