diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-02-04 18:05:42 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-02-04 18:05:42 +0100 |
| commit | 08596f907e5b4fb99a5c9d51799f54f1b0535071 (patch) | |
| tree | abbe8a7d93958de791ded05eb575b8bf983656b4 | |
| parent | 06e719e06390da8e34c8e2d380496e8e5023408d (diff) | |
Fix #186 - Link with TBB for all simplex tree user
| -rw-r--r-- | src/Simplex_tree/example/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/Witness_complex/example/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/common/doc/installation.h | 8 |
3 files changed, 20 insertions, 1 deletions
diff --git a/src/Simplex_tree/example/CMakeLists.txt b/src/Simplex_tree/example/CMakeLists.txt index f99b164c..8a8cac58 100644 --- a/src/Simplex_tree/example/CMakeLists.txt +++ b/src/Simplex_tree/example/CMakeLists.txt @@ -16,6 +16,9 @@ endif() add_test(NAME Simplex_tree_example_simple_simplex_tree COMMAND $<TARGET_FILE:Simplex_tree_example_simple_simplex_tree>) add_executable ( Simplex_tree_example_mini_simplex_tree mini_simplex_tree.cpp ) +if (TBB_FOUND) + target_link_libraries(Simplex_tree_example_mini_simplex_tree ${TBB_LIBRARIES}) +endif() add_test(NAME Simplex_tree_example_mini_simplex_tree COMMAND $<TARGET_FILE:Simplex_tree_example_mini_simplex_tree>) # An example with Simplex-tree using CGAL alpha_shapes_3 diff --git a/src/Witness_complex/example/CMakeLists.txt b/src/Witness_complex/example/CMakeLists.txt index 5860f3a3..2659798e 100644 --- a/src/Witness_complex/example/CMakeLists.txt +++ b/src/Witness_complex/example/CMakeLists.txt @@ -12,10 +12,18 @@ install(TARGETS Witness_complex_example_nearest_landmark_table DESTINATION bin) # CGAL and Eigen3 are required for Euclidean version of Witness if(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0) add_executable( Witness_complex_example_off example_witness_complex_off.cpp ) + if (TBB_FOUND) + target_link_libraries(Witness_complex_example_off ${TBB_LIBRARIES}) + endif() add_executable ( Witness_complex_example_sphere example_witness_complex_sphere.cpp ) + if (TBB_FOUND) + target_link_libraries(Witness_complex_example_sphere ${TBB_LIBRARIES}) + endif() add_executable( Witness_complex_example_strong_off example_strong_witness_complex_off.cpp ) - target_link_libraries(Witness_complex_example_strong_off) + if (TBB_FOUND) + target_link_libraries(Witness_complex_example_strong_off ${TBB_LIBRARIES}) + endif() add_test(NAME Witness_complex_example_off_test_torus COMMAND $<TARGET_FILE:Witness_complex_example_off> diff --git a/src/common/doc/installation.h b/src/common/doc/installation.h index ce2c5448..c2da1ba0 100644 --- a/src/common/doc/installation.h +++ b/src/common/doc/installation.h @@ -204,6 +204,8 @@ make doxygen * Nerve_GIC/Nerve.cpp</a> * \li <a href="_nerve__g_i_c_2_voronoi_g_i_c_8cpp-example.html"> * Nerve_GIC/VoronoiGIC.cpp</a> + * \li <a href="_simplex_tree_2mini_simplex_tree_8cpp-example.html"> + * Simplex_tree/mini_simplex_tree.cpp</a> * \li <a href="_simplex_tree_2simple_simplex_tree_8cpp-example.html"> * Simplex_tree/simple_simplex_tree.cpp</a> * \li <a href="_simplex_tree_2example_alpha_shapes_3_simplex_tree_from_off_file_8cpp-example.html"> @@ -244,6 +246,12 @@ make doxygen * Witness_complex/weak_witness_persistence.cpp</a> * \li <a href="_witness_complex_2example_nearest_landmark_table_8cpp-example.html"> * Witness_complex/example_nearest_landmark_table.cpp</a> + * \li <a href="_witness_complex_2example_strong_witness_complex_off_8cpp-example.html"> + * Witness_complex/example_strong_witness_complex_off.cpp</a> + * \li <a href="_witness_complex_2example_witness_complex_off_8cpp-example.html"> + * Witness_complex/example_witness_complex_off.cpp</a> + * \li <a href="_witness_complex_2example_witness_complex_sphere_8cpp-example.html"> + * Witness_complex/example_witness_complex_sphere.cpp</a> * * \section Contributions Bug reports and contributions * Please help us improving the quality of the GUDHI library. You may report bugs or suggestions to: |