diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-16 11:49:41 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-16 11:49:41 +0000 |
commit | 668e76bbe8f350ab0fdf6f6105e8c7818a5ad38f (patch) | |
tree | 069ec9b257efeb05f775bf8f267b26adc720cb68 /CMakeLists.txt | |
parent | def467c2cb019b7a5cc758b6778957be11465a6e (diff) | |
parent | 1839d09009b10ce3c62770e082a4d7816d991e14 (diff) |
Merged last trunk modifications
Make Witness compile and test
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/rips_complex_module@1755 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: e6eec55ac0a4cc66da3bb081a222cae5b998c1cf
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cecad3e3..d3518a66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ configure_file(GUDHIVersion.cmake.in "${CMAKE_SOURCE_DIR}/GUDHIVersion.cmake" @O find_package(Boost REQUIRED COMPONENTS system filesystem unit_test_framework chrono timer date_time program_options thread REQUIRED) if(NOT Boost_FOUND) - message(FATAL_ERROR "NOTICE: This demo requires Boost and will not be compiled.") + message(FATAL_ERROR "NOTICE: This program requires Boost and will not be compiled.") else() set(CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/") @@ -49,6 +49,10 @@ else() if(CGAL_FOUND) message(STATUS "CGAL version: ${CGAL_VERSION}.") include( ${CGAL_USE_FILE} ) + + if (NOT CGAL_VERSION VERSION_LESS 4.8.0) + include_directories(BEFORE "src/common/include/gudhi_patches") + endif() endif() if(MSVC) @@ -126,6 +130,9 @@ else() include_directories(src/Rips_complex/include/) include_directories(src/Simplex_tree/include/) include_directories(src/Skeleton_blocker/include/) + include_directories(src/Spatial_searching/include/) + include_directories(src/Subsampling/include/) + include_directories(src/Tangential_complex/include/) include_directories(src/Witness_complex/include/) add_subdirectory(src/common/example) @@ -144,6 +151,13 @@ else() add_subdirectory(src/Bitmap_cubical_complex/example) add_subdirectory(src/Alpha_complex/example) add_subdirectory(src/Alpha_complex/test) + add_subdirectory(src/Spatial_searching/example) + add_subdirectory(src/Spatial_searching/test) + add_subdirectory(src/Subsampling/example) + add_subdirectory(src/Subsampling/test) + add_subdirectory(src/Tangential_complex/example) + add_subdirectory(src/Tangential_complex/test) + add_subdirectory(src/Tangential_complex/benchmark) add_subdirectory(src/Rips_complex/example) add_subdirectory(src/Rips_complex/test) |