From 078db27a01c696bba81737f3b722255af7fa2619 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 25 Jun 2020 07:17:22 +0200 Subject: Clean up the modifications --- src/python/CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/python') diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 3b8198bd..c9f30bcf 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -177,6 +177,10 @@ if(PYTHONINTERP_FOUND) add_gudhi_debug_info("GMP_LIBRARIES = ${GMP_LIBRARIES}") set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMP', ") add_GUDHI_PYTHON_lib("${GMP_LIBRARIES}") + if(NOT GMP_LIBRARIES_DIR) + get_filename_component(GMP_LIBRARIES_DIR ${GMP_LIBRARIES} PATH) + message("GMP_LIBRARIES_DIR from GMP_LIBRARIES set to ${GMP_LIBRARIES_DIR}") + endif(NOT GMP_LIBRARIES_DIR) add_GUDHI_PYTHON_lib_dir("${GMP_LIBRARIES_DIR}") message("** Add gmp ${GMP_LIBRARIES_DIR}") if(GMPXX_FOUND) @@ -190,15 +194,14 @@ if(PYTHONINTERP_FOUND) if(MPFR_FOUND) add_gudhi_debug_info("MPFR_LIBRARIES = ${MPFR_LIBRARIES}") set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_MPFR', ") - foreach(MPFR_LIB ${MPFR_LIBRARIES}) - add_GUDHI_PYTHON_lib("${MPFR_LIB}") - endforeach() + add_GUDHI_PYTHON_lib("${MPFR_LIBRARIES}") # In case CGAL is not header only, all MPFR variables are set except MPFR_LIBRARIES_DIR - Just set it if(NOT MPFR_LIBRARIES_DIR) get_filename_component(MPFR_LIBRARIES_DIR ${MPFR_LIBRARIES} PATH) + message("MPFR_LIBRARIES_DIR from MPFR_LIBRARIES set to ${MPFR_LIBRARIES_DIR}") endif(NOT MPFR_LIBRARIES_DIR) add_GUDHI_PYTHON_lib_dir("${MPFR_LIBRARIES_DIR}") - message("** Add mpfr ${MPFR_LIBRARIES} - release ${MPFR_LIBRARIES_RELEASE} - debug ${MPFR_LIBRARIES_DEBUG}") + message("** Add mpfr ${MPFR_LIBRARIES_DIR} - release ${MPFR_LIBRARIES_DIR_RELEASE} - debug ${MPFR_LIBRARIES_DIR_DEBUG}") endif(MPFR_FOUND) endif(CGAL_FOUND) -- cgit v1.2.3