From 5ae0226e2871ba8cfcf28830a6cc753578be9fe4 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Wed, 27 Jun 2018 11:11:13 +0000 Subject: Fix examples and utilities git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alpha_complex_3d_module_vincent@3645 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 67ac8f8151a85988303c48c9453ee42fecb7a97a --- src/Alpha_complex/example/CMakeLists.txt | 64 +++++++++++++++++--------------- 1 file changed, 35 insertions(+), 29 deletions(-) (limited to 'src/Alpha_complex/example/CMakeLists.txt') diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt index c93832d2..5a66067c 100644 --- a/src/Alpha_complex/example/CMakeLists.txt +++ b/src/Alpha_complex/example/CMakeLists.txt @@ -1,37 +1,43 @@ project(Alpha_complex_examples) -# 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(CGAL_FOUND) + add_executable(alpha_complex_3d_step_by_step alpha_complex_3d_step_by_step.cpp) + target_link_libraries(alpha_complex_3d_step_by_step ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) - add_test(NAME Alpha_complex_example_from_points COMMAND $) + if (TBB_FOUND) + target_link_libraries(alpha_complex_3d_step_by_step ${TBB_LIBRARIES}) + endif(TBB_FOUND) - add_test(NAME Alpha_complex_example_from_off_60 COMMAND $ - "${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 $ - "${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_alpha_complex_3d_step_by_step COMMAND $ + "${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off") - 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() + # 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() - install(TARGETS Alpha_complex_example_from_points DESTINATION bin) - install(TARGETS Alpha_complex_example_from_off DESTINATION bin) + add_test(NAME Alpha_complex_example_from_points COMMAND $) - add_executable ( traits_test traits_test.cpp ) + add_test(NAME Alpha_complex_example_from_off_60 COMMAND $ + "${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 $ + "${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}/) -endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0) + 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) +endif() \ No newline at end of file -- cgit v1.2.3