diff options
author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-01-26 08:16:02 +0100 |
---|---|---|
committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-01-26 08:16:02 +0100 |
commit | 7cd975bcb4f932372a3abe932d3b22c9ea1ce38a (patch) | |
tree | 3688cb5df0367e2134d88ccc7e53c78e82916bcb /src/cmake/modules/GUDHI_modules.cmake | |
parent | cee14f45b10d8fd4bee78b4323dea650f8d20f11 (diff) | |
parent | 4d27d023c89d6c6ad10b3923c3cdbd9ed5952711 (diff) |
merge master and resolve conflict
Diffstat (limited to 'src/cmake/modules/GUDHI_modules.cmake')
-rw-r--r-- | src/cmake/modules/GUDHI_modules.cmake | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/cmake/modules/GUDHI_modules.cmake b/src/cmake/modules/GUDHI_modules.cmake index ccaf1ac5..13248f7e 100644 --- a/src/cmake/modules/GUDHI_modules.cmake +++ b/src/cmake/modules/GUDHI_modules.cmake @@ -17,12 +17,6 @@ function(add_gudhi_module file_path) endfunction(add_gudhi_module) -option(WITH_GUDHI_BENCHMARK "Activate/desactivate benchmark compilation" OFF) -option(WITH_GUDHI_EXAMPLE "Activate/desactivate examples compilation and installation" OFF) -option(WITH_GUDHI_PYTHON "Activate/desactivate python module compilation and installation" ON) -option(WITH_GUDHI_TEST "Activate/desactivate examples compilation and installation" ON) -option(WITH_GUDHI_UTILITIES "Activate/desactivate utilities compilation and installation" ON) - if (WITH_GUDHI_BENCHMARK) set(GUDHI_SUB_DIRECTORIES "${GUDHI_SUB_DIRECTORIES};benchmark") endif() |