diff options
| author | Vincent Rouvreau <10407034+VincentRouvreau@users.noreply.github.com> | 2020-12-12 08:02:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-12 08:02:02 +0100 |
| commit | 1a6f1aa1b3119d5b211eda8fb0908a845c920fa5 (patch) | |
| tree | b8bc3c35175871facfb94bfcf589c0a2c53b44b6 /src/python/CMakeLists.txt | |
| parent | d712ec89c9940bcc4629f1177755f859cd7e7c59 (diff) | |
| parent | ba3be8d118a9720677b7776ae9a22c10cfcc0cef (diff) | |
Merge pull request #436 from VincentRouvreau/ci_without_cgal
Add build and tests wo cgal and eigen and wo cgal
Diffstat (limited to 'src/python/CMakeLists.txt')
| -rw-r--r-- | src/python/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 56b6876c..5c1402a6 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -133,6 +133,10 @@ if(PYTHONINTERP_FOUND) add_gudhi_debug_info("Eigen3 version ${EIGEN3_VERSION}") # No problem, even if no CGAL found set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_EIGEN3_ENABLED', ") + set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DGUDHI_USE_EIGEN3', ") + set(GUDHI_USE_EIGEN3 "True") + else (EIGEN3_FOUND) + set(GUDHI_USE_EIGEN3 "False") endif (EIGEN3_FOUND) set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'off_reader', ") @@ -504,7 +508,7 @@ if(PYTHONINTERP_FOUND) endif() # Representations - if(SKLEARN_FOUND AND MATPLOTLIB_FOUND) + if(SKLEARN_FOUND AND MATPLOTLIB_FOUND AND OT_FOUND AND NOT CGAL_VERSION VERSION_LESS 4.11.0) add_gudhi_py_test(test_representations) endif() |