From 248bbbc14e47b40b491ac30adf47391de32ed0f4 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 24 Jan 2017 10:05:00 +0000 Subject: Bottleneck does not require Eigen3 git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1990 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: b04a823f288760750f9146c7b88211c56f4d4f22 --- src/Bottleneck_distance/example/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/Bottleneck_distance/example/CMakeLists.txt') diff --git a/src/Bottleneck_distance/example/CMakeLists.txt b/src/Bottleneck_distance/example/CMakeLists.txt index c66623e9..c7790dfc 100644 --- a/src/Bottleneck_distance/example/CMakeLists.txt +++ b/src/Bottleneck_distance/example/CMakeLists.txt @@ -5,11 +5,9 @@ project(Bottleneck_distance_examples) # cmake -DCGAL_DIR=~/workspace/CGAL-4.8 ../../.. if(CGAL_FOUND) if (NOT CGAL_VERSION VERSION_LESS 4.8.0) - if (EIGEN3_FOUND) - add_executable (bottleneck_read_file_example bottleneck_read_file_example.cpp) - add_executable (bottleneck_basic_example bottleneck_basic_example.cpp) + add_executable (bottleneck_read_file_example bottleneck_read_file_example.cpp) + add_executable (bottleneck_basic_example bottleneck_basic_example.cpp) - add_test(bottleneck_basic_example ${CMAKE_CURRENT_BINARY_DIR}/bottleneck_basic_example) - endif() + add_test(bottleneck_basic_example ${CMAKE_CURRENT_BINARY_DIR}/bottleneck_basic_example) endif () endif() -- cgit v1.2.3 From 3fa0696c1075f2ee0396bff10aa822e6ffe00ae3 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 24 Jan 2017 13:22:42 +0000 Subject: Add Alpha Rips persistence bottleneck distance example and its test in cmake git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_misc_fixes@1996 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 30c7f3c253730ea8384ae143a629e9b22ef6d507 --- src/Bottleneck_distance/example/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/Bottleneck_distance/example/CMakeLists.txt') diff --git a/src/Bottleneck_distance/example/CMakeLists.txt b/src/Bottleneck_distance/example/CMakeLists.txt index c7790dfc..b36d0f34 100644 --- a/src/Bottleneck_distance/example/CMakeLists.txt +++ b/src/Bottleneck_distance/example/CMakeLists.txt @@ -9,5 +9,14 @@ if(CGAL_FOUND) add_executable (bottleneck_basic_example bottleneck_basic_example.cpp) add_test(bottleneck_basic_example ${CMAKE_CURRENT_BINARY_DIR}/bottleneck_basic_example) + + add_executable (alpha_rips_persistence_bottleneck_distance alpha_rips_persistence_bottleneck_distance.cpp) + target_link_libraries(alpha_rips_persistence_bottleneck_distance ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) + if (TBB_FOUND) + target_link_libraries(alpha_rips_persistence_bottleneck_distance ${TBB_LIBRARIES}) + endif(TBB_FOUND) + add_test(alpha_rips_persistence_bottleneck_distance ${CMAKE_CURRENT_BINARY_DIR}/alpha_rips_persistence_bottleneck_distance + ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -r 0.15 -m 0.12 -d 3 -p 3) + endif () endif() -- cgit v1.2.3