summaryrefslogtreecommitdiff
path: root/src/cython
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-08-31 11:59:31 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-08-31 11:59:31 +0000
commitc5b865f6e9e1ae60de2720c76aee1dfccf470023 (patch)
tree9aa3428250cfb6ff53840343edf1b5801a694983 /src/cython
parent2ffe7a5477803025b3de2abf59725d8dc2588f73 (diff)
Works fine in debug and release mode
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3857 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 2cc11e2a6e7f8eed6c234c17cad7ff04efdbc659
Diffstat (limited to 'src/cython')
-rw-r--r--src/cython/CMakeLists.txt11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index fb613639..90a2fcf7 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -1,9 +1,7 @@
project(Cython)
function( add_gudhi_cython_lib THE_LIB )
- message("##### add_gudhi_cython_lib on ${THE_LIB}")
if(EXISTS ${THE_LIB})
- message("##### EXISTS")
get_filename_component(THE_LIB_FILE_NAME ${THE_LIB} NAME_WE)
if(WIN32)
message("++ ${THE_LIB} => THE_LIB_FILE_NAME = ${THE_LIB_FILE_NAME}")
@@ -132,12 +130,9 @@ if(CYTHON_FOUND)
if(CGAL_FOUND)
can_cgal_use_cxx11_thread_local()
if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT)
- 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}', ")
@@ -148,18 +143,13 @@ 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("##### CGAL_LIBRARIES - ${CGAL_LIBRARIES}")
add_gudhi_cython_lib("${CGAL_LIBRARIES}")
- 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("##### 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}', ")
@@ -168,7 +158,6 @@ if(CYTHON_FOUND)
if(GMP_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}")
set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ")
if(GMPXX_FOUND)