diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-04-08 15:46:05 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-04-08 15:46:05 +0000 |
| commit | 03b700251ba8aee55e1cca1038d397135f1c9408 (patch) | |
| tree | 0bc2806d6769e981e2610696517667b3fcbc5fbb /CMakeLists.txt | |
| parent | 178b86f53cb16964de4365948ada341b7012c1da (diff) | |
| parent | 607fc8aa10122089aa2b3debf36e48250e2dfb5b (diff) | |
Merge of alpha complex feature from trunk
Add Eigen3 in installation
Add alpha complex in introduction
All examples directory moved to example (was example/common, example/Alpha_complex)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Doxygen_for_GUDHI_1.3.0@1110 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 0b88a4f2b102e2189f4b916b8358ffb2458a72f0
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 94336e19..6ad3a58f 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) @@ -78,7 +78,10 @@ else() if (GPROF_PATH) message("gprof found in ${GPROF_PATH}") endif() - +FIND_PROGRAM( DIFF_PATH diff ) +if (DIFF_PATH) + message("diff found in ${DIFF_PATH}") +endif() # BOOST ISSUE result_of vs C++11 add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) @@ -91,7 +94,14 @@ else() message(STATUS "boost include dirs:" ${Boost_INCLUDE_DIRS}) message(STATUS "boost library dirs:" ${Boost_LIBRARY_DIRS}) + if (DEBUG_TRACES) + # For programs to be more verbose + message(STATUS "DEBUG_TRACES are activated") + add_definitions(-DDEBUG_TRACES) + 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/) @@ -101,6 +111,8 @@ else() include_directories(src/Skeleton_blocker/include/) include_directories(src/Witness_complex/include/) + add_subdirectory(src/common/example) + add_subdirectory(src/common/test) add_subdirectory(src/Simplex_tree/test) add_subdirectory(src/Simplex_tree/example) add_subdirectory(src/Persistent_cohomology/test) @@ -112,6 +124,8 @@ else() 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) # data points generator add_subdirectory(data/points/generator) @@ -121,3 +135,5 @@ else() add_subdirectory(src/GudhUI) endif() + + |