diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 15:33:53 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 15:33:53 +0000 |
| commit | 3f451b963739a595d990be5517d386259ddb487f (patch) | |
| tree | 4e6b8ccbf21c28c103effd9342f75907c89cf42a /CMakeLists.txt | |
| parent | ad6a64ad5a4f4121410250021eda0904eb9c718c (diff) | |
| parent | cbf1a50068a2c5dea6d732d40dfc66d34460d863 (diff) | |
Merge last trunk modifications in qt5 branch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/qt5@1976 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 7f8c5b9443bf0996347fe459fe21c42a2fed0cca
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 005df6d7..1346f5d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,10 +123,11 @@ 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/) + 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) @@ -156,6 +158,11 @@ 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) # data points generator add_subdirectory(data/points/generator) |