diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-06-08 11:35:53 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-06-08 11:35:53 +0000 |
commit | f3c41e18d5122dffd98c49412c364f0a07ee0bb6 (patch) | |
tree | 6dff4432c323fbae848bab9b2acfc3aa5d749b23 /src/CMakeLists.txt | |
parent | 7035590cdfd71eb7454d638f3b479d62a0ebadf4 (diff) | |
parent | cc82a86455ebcc0556c7f97ffdc74d6f45b5b94d (diff) |
Merge branch cmake_gudhi_modules tobe able to activate/desactivate modules compilation and test
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2517 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 3ea8fc4ae22f35f98e454134b61db02520bd1c06
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8abfcf44..795005b1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,10 +7,8 @@ enable_testing() list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") -# To be done first - Modules list can be found in CMAKE_MODULE_PATH/GUDHI_modules.cmake -include(GUDHI_modules) - # Add your new module in the list, order is not important +include(GUDHI_modules) add_gudhi_module(common) add_gudhi_module(Alpha_complex) @@ -27,6 +25,8 @@ add_gudhi_module(Subsampling) add_gudhi_module(Tangential_complex) add_gudhi_module(Witness_complex) +message("++ GUDHI_MODULES list is:\"${GUDHI_MODULES}\"") + # For "make doxygen" - Requires GUDHI_USER_VERSION_DIR to be set set(GUDHI_USER_VERSION_DIR ${CMAKE_SOURCE_DIR}) include(GUDHI_doxygen_target) @@ -71,7 +71,7 @@ endforeach() add_subdirectory(GudhUI) -if (NOT WITHOUT_GUDHI_PYTHON) +if (WITH_GUDHI_PYTHON) # specific for cython module add_subdirectory(${GUDHI_CYTHON_PATH}) endif() |