diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-08-31 11:23:50 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-08-31 11:23:50 +0000 |
| commit | fd7e0464bde1a357fda43ced4ff26b36bdc58a56 (patch) | |
| tree | 361ecd95f11045bf6960a33b96126b5ae96e2a73 | |
| parent | 6048f92357bbce6de009c2441d9354e5f2f4b8ae (diff) | |
Pass parameters to cmake function through double quote for unset variables case
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3855 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 57ff4e884e6575cc7938da3937a7a0090567ad74
| -rw-r--r-- | src/cython/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 50355f84..f9eccaa3 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -133,7 +133,7 @@ if(CYTHON_FOUND) can_cgal_use_cxx11_thread_local() if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) message("##### add_gudhi_cython_lib Boost_THREAD_LIBRARY - ${Boost_THREAD_LIBRARY}") - add_gudhi_cython_lib(${Boost_THREAD_LIBRARY}) + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif() # Add CGAL compilation args @@ -143,13 +143,13 @@ if(CYTHON_FOUND) else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") message("##### add_gudhi_cython_lib CGAL_LIBRARIES - ${CGAL_LIBRARIES}") - add_gudhi_cython_lib(${CGAL_LIBRARIES}) + add_gudhi_cython_lib("${CGAL_LIBRARIES}") message("##### add_gudhi_cython_lib CGAL_LIBRARY - ${CGAL_LIBRARY}") - add_gudhi_cython_lib(${CGAL_LIBRARY}) + add_gudhi_cython_lib("${CGAL_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # If CGAL is not header only, CGAL library may link with boost system, message("##### add_gudhi_cython_lib Boost_SYSTEM_LIBRARY - ${Boost_SYSTEM_LIBRARY}") - add_gudhi_cython_lib(${Boost_SYSTEM_LIBRARY}) + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif(CGAL_HEADER_ONLY) # GMP and GMPXX are not required, but if present, CGAL will link with them. @@ -157,12 +157,12 @@ if(CYTHON_FOUND) add_gudhi_debug_info("GMP_LIBRARIES = ${GMP_LIBRARIES}") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMP', ") message("##### add_gudhi_cython_lib GMP_LIBRARIES - ${GMP_LIBRARIES}") - add_gudhi_cython_lib(${GMP_LIBRARIES}) + add_gudhi_cython_lib("${GMP_LIBRARIES}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ") if(GMPXX_FOUND) add_gudhi_debug_info("GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMPXX', ") - add_gudhi_cython_lib(${GMPXX_LIBRARIES}) + add_gudhi_cython_lib("${GMPXX_LIBRARIES}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMPXX_LIBRARIES_DIR}', ") endif(GMPXX_FOUND) endif(GMP_FOUND) @@ -184,8 +184,8 @@ if(CYTHON_FOUND) if (TBB_FOUND AND WITH_GUDHI_USE_TBB) add_gudhi_debug_info("TBB version ${TBB_INTERFACE_VERSION} found and used") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DGUDHI_USE_TBB', ") - add_gudhi_cython_lib(${TBB_RELEASE_LIBRARY}) - add_gudhi_cython_lib(${TBB_MALLOC_RELEASE_LIBRARY}) + add_gudhi_cython_lib("${TBB_RELEASE_LIBRARY}") + add_gudhi_cython_lib("${TBB_MALLOC_RELEASE_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${TBB_LIBRARY_DIRS}', ") set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${TBB_INCLUDE_DIRS}', ") endif() |