diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-04-08 11:43:19 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-04-08 11:43:19 +0000 |
| commit | 635eda52786951558d820b06bb18b9f6d54dc89a (patch) | |
| tree | 420adf59e7d1d133c3f8838ca9c82525a57df6d8 /CMakeLists.txt | |
| parent | 3cabde73eaf1a29f36a6014bccc795349666346c (diff) | |
| parent | 0ca1fbeb35a9a681320186f63a7cf26256ebf05a (diff) | |
Merge last trunk development
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@1107 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a8fcecf0beb0517a1da01c57d2e1c2e32a2aba89
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dc6de64d..ecd1f7fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(GUDHIdev) include(CMakeGUDHIVersion.txt) # Generate GUDHI official version file -configure_file(GUDHIVersion.cmake.in "${PROJECT_BINARY_DIR}/GUDHIVersion.cmake" @ONLY) +configure_file(GUDHIVersion.cmake.in "${CMAKE_SOURCE_DIR}/GUDHIVersion.cmake" @ONLY) find_package(Boost REQUIRED COMPONENTS system filesystem unit_test_framework chrono timer program_options thread REQUIRED) @@ -93,12 +93,14 @@ endif() 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/Contraction/include/) include_directories(src/Hasse_complex/include/) 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/common/example) add_subdirectory(src/common/test) @@ -109,6 +111,10 @@ endif() add_subdirectory(src/Skeleton_blocker/test) add_subdirectory(src/Skeleton_blocker/example) add_subdirectory(src/Contraction/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) add_subdirectory(src/Alpha_complex/example) add_subdirectory(src/Alpha_complex/test) |