diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-22 16:49:21 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-22 16:49:21 +0000 |
commit | 899838ae83f4a9cea085ba877e91a7ca035fbb4d (patch) | |
tree | 76c56df09e6ad006f94aa46b0d355492e4830f4b /CMakeLists.txt | |
parent | 81575612aaa0552307a6c744c327765ff89165e4 (diff) | |
parent | 707120336966af3dffb8b54cd0095fc1bcc3836d (diff) |
Merged with trunk + minor changes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2094 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 6b23778cbe43e7697cd325039e843758a263d927
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f949a803..1346f5d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,6 +127,7 @@ else() include_directories(src/Contraction/include/) include_directories(src/Hasse_complex/include/) include_directories(src/Persistent_cohomology/include/) + include_directories(src/Rips_complex/include/) include_directories(src/Simplex_tree/include/) include_directories(src/Skeleton_blocker/include/) include_directories(src/Spatial_searching/include/) @@ -140,6 +141,7 @@ else() add_subdirectory(src/Simplex_tree/example) add_subdirectory(src/Persistent_cohomology/test) add_subdirectory(src/Persistent_cohomology/example) + add_subdirectory(src/Persistent_cohomology/benchmark) add_subdirectory(src/Skeleton_blocker/test) add_subdirectory(src/Skeleton_blocker/example) add_subdirectory(src/Contraction/example) @@ -159,6 +161,8 @@ else() 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) # data points generator add_subdirectory(data/points/generator) |