diff options
author | Vincent Rouvreau <10407034+VincentRouvreau@users.noreply.github.com> | 2022-11-22 07:54:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-22 07:54:18 +0100 |
commit | 854dd8c421c9489ec9d11325afe0cfc7592d9131 (patch) | |
tree | 4db9820b27a29b3f7444ef12f5e22e20d8cf0936 | |
parent | cc53ac660a629d9f14b1111e8106bee8bb5be6e9 (diff) | |
parent | 53c42506c7b799c8b9b6304fc4f33ef1f68e0181 (diff) |
Merge pull request #753 from VincentRouvreau/fix/cmake_numpy_dependency
Python module should not be compiled if numpy is not found
-rw-r--r-- | src/python/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 32ec13bd..0bb864ff 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -44,7 +44,7 @@ function( add_gudhi_debug_info DEBUG_INFO ) endfunction( add_gudhi_debug_info ) if(PYTHONINTERP_FOUND) - if(PYBIND11_FOUND AND CYTHON_FOUND) + if(NUMPY_FOUND AND PYBIND11_FOUND AND CYTHON_FOUND) add_gudhi_debug_info("Pybind11 version ${PYBIND11_VERSION}") # PyBind11 modules set(GUDHI_PYTHON_MODULES "${GUDHI_PYTHON_MODULES}'bottleneck', ") @@ -623,10 +623,10 @@ if(PYTHONINTERP_FOUND) # Set missing or not modules set(GUDHI_MODULES ${GUDHI_MODULES} "python" CACHE INTERNAL "GUDHI_MODULES") - else(PYBIND11_FOUND AND CYTHON_FOUND) - message("++ Python module will not be compiled because cython and/or pybind11 was/were not found") + else(NUMPY_FOUND AND PYBIND11_FOUND AND CYTHON_FOUND) + message("++ Python module will not be compiled because numpy and/or cython and/or pybind11 was/were not found") set(GUDHI_MISSING_MODULES ${GUDHI_MISSING_MODULES} "python" CACHE INTERNAL "GUDHI_MISSING_MODULES") - endif(PYBIND11_FOUND AND CYTHON_FOUND) + endif(NUMPY_FOUND AND PYBIND11_FOUND AND CYTHON_FOUND) else(PYTHONINTERP_FOUND) message("++ Python module will not be compiled because no Python interpreter was found") set(GUDHI_MISSING_MODULES ${GUDHI_MISSING_MODULES} "python" CACHE INTERNAL "GUDHI_MISSING_MODULES") |