diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-01 06:13:11 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-01 06:13:11 +0000 |
commit | 8de27e00ad080e6616928641baf704cfbe318976 (patch) | |
tree | d61149ee66b2b100f20b7b2c5ed1d7bbf4618a6a /src | |
parent | fda43b1fde4774909c632a0604ae7ad05a660d3a (diff) |
Only Euclidean version of Witness requires CGAL and Eigen3
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2123 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: ca4c8174eb5dc4787113659f5289104af2515bcd
Diffstat (limited to 'src')
-rw-r--r-- | src/Witness_complex/example/CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/common/doc/main_page.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Witness_complex/example/CMakeLists.txt b/src/Witness_complex/example/CMakeLists.txt index c18d59d2..2691479d 100644 --- a/src/Witness_complex/example/CMakeLists.txt +++ b/src/Witness_complex/example/CMakeLists.txt @@ -1,7 +1,13 @@ cmake_minimum_required(VERSION 2.6) project(Witness_complex_examples) +add_executable ( Witness_complex_example_nearest_landmark_table example_nearest_landmark_table.cpp ) +if (TBB_FOUND) + target_link_libraries(Witness_complex_example_nearest_landmark_table ${TBB_LIBRARIES}) +endif() +add_test(Witness_complex_test_nearest_landmark_table Witness_complex_example_nearest_landmark_table) +# CGAL and Eigen3 are required for Euclidean version of Witness if(CGAL_FOUND) if (NOT CGAL_VERSION VERSION_LESS 4.6.0) if (EIGEN3_FOUND) @@ -15,11 +21,9 @@ if(CGAL_FOUND) add_executable ( Witness_complex_example_strong_witness_persistence example_strong_witness_persistence.cpp ) target_link_libraries(Witness_complex_example_strong_witness_persistence ${Boost_PROGRAM_OPTIONS_LIBRARY}) - add_executable ( Witness_complex_example_nearest_landmark_table example_nearest_landmark_table.cpp ) if (TBB_FOUND) target_link_libraries(Witness_complex_example_witness_persistence ${TBB_LIBRARIES}) target_link_libraries(Witness_complex_example_strong_witness_persistence ${TBB_LIBRARIES}) - target_link_libraries(Witness_complex_example_nearest_landmark_table ${TBB_LIBRARIES}) endif() add_test(Witness_complex_off_test_torus @@ -35,7 +39,6 @@ if(CGAL_FOUND) add_test(Witness_complex_strong_test_torus_persistence ${CMAKE_CURRENT_BINARY_DIR}/Witness_complex_example_strong_witness_persistence ${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off -l 20 -a 0.5) - add_test(Witness_complex_test_nearest_landmark_table Witness_complex_example_nearest_landmark_table) endif(EIGEN3_FOUND) endif (NOT CGAL_VERSION VERSION_LESS 4.6.0) endif() diff --git a/src/common/doc/main_page.h b/src/common/doc/main_page.h index e6323628..5ca0a6bc 100644 --- a/src/common/doc/main_page.h +++ b/src/common/doc/main_page.h @@ -140,7 +140,7 @@ <b>Author:</b> Siargey Kachanovich<br> <b>Introduced in:</b> GUDHI 1.3.0<br> <b>Copyright:</b> GPL v3<br> - <b>Requires:</b> \ref cgal ≥ 4.6.0 and \ref eigen3 + <b>Euclidean version requires:</b> \ref cgal ≥ 4.6.0 and \ref eigen3 </td> <td width="75%"> Witness complex \f$ Wit(W,L) \f$ is a simplicial complex defined on two sets of points in \f$\mathbb{R}^D\f$. |