diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 754a7bd1..4c772506 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIdev) include(CMakeGUDHIVersion.txt) -# Generate GUDHI official version file -configure_file(GUDHIVersion.cmake.in "${CMAKE_SOURCE_DIR}/GUDHIVersion.cmake" @ONLY) set(CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/") @@ -15,9 +13,11 @@ enable_testing() # For "make user_version" include("${CMAKE_MODULE_PATH}/GUDHI_user_version_target.txt") # For "make doxygen" -include("${CMAKE_MODULE_PATH}/GUDHI_doxygen_target.txt") +include(GUDHI_doxygen_target) +# This variable is used by Cython CMakeLists.txt to know its path +set(GUDHI_CYTHON_PATH "src/cython") # For third parties libraries management - To be done last as CGAL updates CMAKE_MODULE_PATH -include("${CMAKE_MODULE_PATH}/GUDHI_third_party_libraries.txt") +include(GUDHI_third_party_libraries) if(MSVC) # Turn off some VC++ warnings @@ -84,7 +84,6 @@ add_subdirectory(src/Rips_complex/example) add_subdirectory(src/Rips_complex/test) add_subdirectory(src/Gudhi_stat/test) add_subdirectory(src/Gudhi_stat/example) -add_subdirectory(src/Gudhi_stat/utilities) add_subdirectory(src/Gudhi_stat/utilities/persistence_heat_maps) add_subdirectory(src/Gudhi_stat/utilities/persistence_intervals) add_subdirectory(src/Gudhi_stat/utilities/persistence_landscapes) @@ -96,6 +95,5 @@ add_subdirectory(data/points/generator) add_subdirectory(src/GudhUI) -# This variable is used by Cython CMakeLists.txt to know its path -set(GUDHI_CYTHON_PATH "src/cython") +# specific for cython module add_subdirectory(${GUDHI_CYTHON_PATH}) |