diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-08-31 11:38:56 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-08-31 11:38:56 +0000 |
commit | 2ffe7a5477803025b3de2abf59725d8dc2588f73 (patch) | |
tree | a7f67d49911c9344666ef55b1b4585614fa2155d | |
parent | fd7e0464bde1a357fda43ced4ff26b36bdc58a56 (diff) |
Try with boost release and debug lib versions
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3856 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 130a4319577ef0ec8c10a87c98b7ffcf6f16d808
-rw-r--r-- | src/cython/CMakeLists.txt | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index f9eccaa3..fb613639 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -132,8 +132,14 @@ if(CYTHON_FOUND) if(CGAL_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}") + message("##### Boost_THREAD_LIBRARY - ${Boost_THREAD_LIBRARY}") + if(CMAKE_BUILD_TYPE MATCHES Debug) + message("##### Boost_THREAD_LIBRARY_DEBUG - ${Boost_THREAD_LIBRARY_DEBUG}") + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_DEBUG}") + else() + message("##### Boost_THREAD_LIBRARY_RELEASE - ${Boost_THREAD_LIBRARY_RELEASE}") + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_RELEASE}") + endif() set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif() # Add CGAL compilation args @@ -142,14 +148,20 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") - message("##### add_gudhi_cython_lib CGAL_LIBRARIES - ${CGAL_LIBRARIES}") + message("##### CGAL_LIBRARIES - ${CGAL_LIBRARIES}") add_gudhi_cython_lib("${CGAL_LIBRARIES}") - message("##### add_gudhi_cython_lib CGAL_LIBRARY - ${CGAL_LIBRARY}") + message("##### CGAL_LIBRARY - ${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}") + message("##### Boost_SYSTEM_LIBRARY - ${Boost_SYSTEM_LIBRARY}") + if(CMAKE_BUILD_TYPE MATCHES Debug) + message("##### Boost_SYSTEM_LIBRARY_DEBUG - ${Boost_SYSTEM_LIBRARY_DEBUG}") + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_DEBUG}") + else() + message("##### Boost_SYSTEM_LIBRARY_RELEASE - ${Boost_SYSTEM_LIBRARY_RELEASE}") + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_RELEASE}") + endif() 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. |