diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-05 14:24:01 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-05 14:24:01 +0100 |
| commit | f78d65f0bd6aaf5f92639e2b809e1711acf929f7 (patch) | |
| tree | 42272a2d27eea45735b806ce46e61c41b1f5ea9a /src/Bottleneck_distance | |
| parent | 73ad191a7dee054a58e9823c84dce9f1e71995f4 (diff) | |
| parent | d2943b9e7311c8a3d8a4fb379c39b15497481b9c (diff) | |
Merge branch 'master' into print_warnings_to_stderr
Diffstat (limited to 'src/Bottleneck_distance')
| -rw-r--r-- | src/Bottleneck_distance/example/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Bottleneck_distance/include/gudhi/Persistence_graph.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Bottleneck_distance/example/CMakeLists.txt b/src/Bottleneck_distance/example/CMakeLists.txt index 3d65963a..9839c59d 100644 --- a/src/Bottleneck_distance/example/CMakeLists.txt +++ b/src/Bottleneck_distance/example/CMakeLists.txt @@ -13,7 +13,7 @@ endif (NOT CGAL_VERSION VERSION_LESS 4.11.0) if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0) add_executable (alpha_rips_persistence_bottleneck_distance alpha_rips_persistence_bottleneck_distance.cpp) - target_link_libraries(alpha_rips_persistence_bottleneck_distance ${Boost_PROGRAM_OPTIONS_LIBRARY}) + target_link_libraries(alpha_rips_persistence_bottleneck_distance Boost::program_options) if (TBB_FOUND) target_link_libraries(alpha_rips_persistence_bottleneck_distance ${TBB_LIBRARIES}) diff --git a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h index f791e37c..e1e3522e 100644 --- a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h +++ b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h @@ -25,7 +25,7 @@ namespace Gudhi { namespace persistence_diagram { -/** \internal \brief Structure representing an euclidean bipartite graph containing +/** \internal \brief Structure representing a Euclidean bipartite graph containing * the points from the two persistence diagrams (including the projections). * * \ingroup bottleneck_distance |