diff options
author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-03-20 18:31:04 +0000 |
---|---|---|
committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-03-20 18:31:04 +0000 |
commit | d3ff792428d5bc10cebcbccb5286e791f8b34905 (patch) | |
tree | 746bbe051772298e84c74f5d59e94b8138c28c9e /CMakeLists.txt | |
parent | 10083c1ed5ae478b54b6bb1b17be3325838533fe (diff) | |
parent | 245a316b04bbf0883f17cc5116fb8f26251aabd4 (diff) |
Merge from trunk.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bitmap@1061 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a9684c0981a81be9db4362e5bd6c8fb9590661ca
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d2f932c..abb66ec2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,7 @@ else() include_directories(src/Persistent_cohomology/include/) include_directories(src/Simplex_tree/include/) include_directories(src/Skeleton_blocker/include/) + include_directories(src/Witness_complex/include/) add_subdirectory(src/Simplex_tree/test) add_subdirectory(src/Simplex_tree/example) @@ -98,8 +99,10 @@ else() add_subdirectory(src/Skeleton_blocker/test) add_subdirectory(src/Skeleton_blocker/example) add_subdirectory(src/Contraction/example) - add_subdirectory(src/Bitmap_cubical_complex/example) + add_subdirectory(src/Witness_complex/test) + add_subdirectory(src/Witness_complex/example) add_subdirectory(src/Bitmap_cubical_complex/test) + add_subdirectory(src/Bitmap_cubical_complex/example) # data points generator add_subdirectory(data/points/generator) @@ -109,5 +112,3 @@ else() add_subdirectory(src/GudhUI) endif() - - |