diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-16 09:20:20 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-16 09:20:20 +0000 |
| commit | df601fe3e27210133e3551352382be779a4408ca (patch) | |
| tree | 9cd934f71a340540c798e8c92076625f1992b3ad /CMakeLists.txt | |
| parent | a2977f4038b8cfc375f037de7c5c805a9079f9f7 (diff) | |
| parent | e3707de64413df06f83770a40ed8ba4ad9a69951 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1938 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 8af39a00b9134dbcc77883412c29d7184479979b
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d3518a66..1346f5d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,7 @@ else() include_directories(src/common/include/) include_directories(src/Alpha_complex/include/) include_directories(src/Bitmap_cubical_complex/include/) - include_directories(src/Bottleneck/include/) + include_directories(src/Bottleneck_distance/include/) include_directories(src/Contraction/include/) include_directories(src/Hasse_complex/include/) include_directories(src/Persistent_cohomology/include/) @@ -158,6 +158,9 @@ else() add_subdirectory(src/Tangential_complex/example) add_subdirectory(src/Tangential_complex/test) add_subdirectory(src/Tangential_complex/benchmark) + add_subdirectory(src/Bottleneck_distance/example) + add_subdirectory(src/Bottleneck_distance/test) + add_subdirectory(src/Bottleneck_distance/benchmark) add_subdirectory(src/Rips_complex/example) add_subdirectory(src/Rips_complex/test) |