diff options
author | tlacombe <lacombe1993@gmail.com> | 2019-12-16 17:19:44 +0100 |
---|---|---|
committer | tlacombe <lacombe1993@gmail.com> | 2019-12-16 17:19:44 +0100 |
commit | efebda596ae5a03dd0f15317ebfe74b5f19c78aa (patch) | |
tree | c21581669c5dcc985bed33fd043c0999f4e20e7d /src/Bottleneck_distance | |
parent | aba9ad68394b0c5aae22c450cac7162733132002 (diff) | |
parent | 3f1601665cbd0b7397c9c19f55d608246192207b (diff) |
Merge branch 'master' into wbary-theo
updating master in wbary-theo
Diffstat (limited to 'src/Bottleneck_distance')
-rw-r--r-- | src/Bottleneck_distance/include/gudhi/Bottleneck.h | 2 | ||||
-rw-r--r-- | src/Bottleneck_distance/test/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Bottleneck.h b/src/Bottleneck_distance/include/gudhi/Bottleneck.h index 82ba9f68..e466828a 100644 --- a/src/Bottleneck_distance/include/gudhi/Bottleneck.h +++ b/src/Bottleneck_distance/include/gudhi/Bottleneck.h @@ -26,7 +26,7 @@ // Make compilation fail - required for external projects - https://github.com/GUDHI/gudhi-devel/issues/10 #if CGAL_VERSION_NR < 1041101000 -# error Alpha_complex_3d is only available for CGAL >= 4.11 +# error bottleneck_distance is only available for CGAL >= 4.11 #endif namespace Gudhi { diff --git a/src/Bottleneck_distance/test/CMakeLists.txt b/src/Bottleneck_distance/test/CMakeLists.txt index ec2d045f..3acd3d86 100644 --- a/src/Bottleneck_distance/test/CMakeLists.txt +++ b/src/Bottleneck_distance/test/CMakeLists.txt @@ -1,14 +1,13 @@ project(Bottleneck_distance_tests) if (NOT CGAL_VERSION VERSION_LESS 4.11.0) - include(GUDHI_test_coverage) + include(GUDHI_boost_test) add_executable ( Bottleneck_distance_test_unit bottleneck_unit_test.cpp ) - target_link_libraries(Bottleneck_distance_test_unit ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) if (TBB_FOUND) target_link_libraries(Bottleneck_distance_test_unit ${TBB_LIBRARIES}) endif(TBB_FOUND) - gudhi_add_coverage_test(Bottleneck_distance_test_unit) + gudhi_add_boost_test(Bottleneck_distance_test_unit) endif (NOT CGAL_VERSION VERSION_LESS 4.11.0) |