diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-12-06 08:13:32 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-12-06 08:13:32 +0000 |
| commit | 9c0ff374057baf19d3ea1147553b68f5293074ac (patch) | |
| tree | 007f17b1fd37ef7f689a63d4ebcaf9fa409d76ee /src/Bottleneck_distance/utilities | |
| parent | 841c4db0448687a61c25bd57729ae0cad1ae2b72 (diff) | |
| parent | 86f7c676f094e44d4c06392c452b372f4470099b (diff) | |
Merge add_utils_in_gudhi_v2 branch after 2nd round of review
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3041 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: ad134cc2b6756e20afc8d9db9e40c5af87d09f9d
Diffstat (limited to 'src/Bottleneck_distance/utilities')
| -rw-r--r-- | src/Bottleneck_distance/utilities/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/Bottleneck_distance/utilities/bottleneck_distance.cpp (renamed from src/Bottleneck_distance/utilities/bottleneck_read_file.cpp) | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Bottleneck_distance/utilities/CMakeLists.txt b/src/Bottleneck_distance/utilities/CMakeLists.txt index 063b6ae3..d19e3b1c 100644 --- a/src/Bottleneck_distance/utilities/CMakeLists.txt +++ b/src/Bottleneck_distance/utilities/CMakeLists.txt @@ -2,15 +2,15 @@ cmake_minimum_required(VERSION 2.6) project(Bottleneck_distance_utilities) if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) - add_executable (bottleneck_read_file bottleneck_read_file.cpp) + add_executable (bottleneck_distance bottleneck_distance.cpp) if (TBB_FOUND) - target_link_libraries(bottleneck_read_file ${TBB_LIBRARIES}) + target_link_libraries(bottleneck_distance ${TBB_LIBRARIES}) endif(TBB_FOUND) add_test(NAME Bottleneck_distance_utilities_Bottleneck_read_file - COMMAND $<TARGET_FILE:bottleneck_read_file> + COMMAND $<TARGET_FILE:bottleneck_distance> "${CMAKE_SOURCE_DIR}/data/persistence_diagram/first.pers" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/second.pers") - install(TARGETS bottleneck_read_file DESTINATION bin) + install(TARGETS bottleneck_distance DESTINATION bin) endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) diff --git a/src/Bottleneck_distance/utilities/bottleneck_read_file.cpp b/src/Bottleneck_distance/utilities/bottleneck_distance.cpp index 9dd52b31..9dd52b31 100644 --- a/src/Bottleneck_distance/utilities/bottleneck_read_file.cpp +++ b/src/Bottleneck_distance/utilities/bottleneck_distance.cpp |