summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-12-15 22:21:54 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-12-15 22:21:54 +0000
commit75585b58076af057d1e458ea5668a97455d93688 (patch)
treedc8a802e6195054dc07a457fe8743f2326070755 /CMakeLists.txt
parentb93ea27ea392f49f85deee23526c9330a716093b (diff)
parent0df3c9bcca4345b8be27ca2fd90eb5137072740c (diff)
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1888 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 951a081ac634f829fa49265005ea1e620f2c08ca
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt16
1 files changed, 15 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3935c0d1..d1a3c7bf 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)
@@ -125,6 +129,9 @@ else()
include_directories(src/Persistent_cohomology/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)
@@ -142,6 +149,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/Bottleneck_distance/example)
add_subdirectory(src/Bottleneck_distance/test)