diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-06-08 11:47:05 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-06-08 11:47:05 +0000 |
| commit | d50326ba839ce43949cb31fe8de0137890a2ea79 (patch) | |
| tree | 41c5dff424445d4f076a7900f10f24828c167f77 /CMakeLists.txt | |
| parent | c0de06792e3f54067cb87d282d0a226dcf6abd7f (diff) | |
| parent | f3c41e18d5122dffd98c49412c364f0a07ee0bb6 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/persistence_representation_integration@2518 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 151fc33b9b13d43f331de0a3745375f9688684f1
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b445e8df..b1bde390 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,11 +34,9 @@ if (DEBUG_TRACES) add_definitions(-DDEBUG_TRACES) endif() -# Modules list can be found in CMAKE_MODULE_PATH/GUDHI_modules.cmake +# Add your new module in the list, order is not important include(GUDHI_modules) -include_directories(src/Persistence_representations/include/) -# Add your new module in the list, order is not important add_gudhi_module(common) add_gudhi_module(Alpha_complex) add_gudhi_module(Bitmap_cubical_complex) @@ -55,12 +53,7 @@ add_gudhi_module(Subsampling) add_gudhi_module(Tangential_complex) add_gudhi_module(Witness_complex) -# Include module headers -foreach(GUDHI_MODULE ${GUDHI_MODULES}) - if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/src/${GUDHI_MODULE}/include/) - include_directories(src/${GUDHI_MODULE}/include/) - endif() -endforeach() +message("++ GUDHI_MODULES list is:\"${GUDHI_MODULES}\"") # Include module CMake subdirectories # GUDHI_SUB_DIRECTORIES is managed in CMAKE_MODULE_PATH/GUDHI_modules.cmake @@ -74,7 +67,7 @@ endforeach() add_subdirectory(src/GudhUI) -if (NOT WITHOUT_GUDHI_PYTHON) +if (WITH_GUDHI_PYTHON) # specific for cython module add_subdirectory(${GUDHI_CYTHON_PATH}) endif() |