diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-06-14 05:24:01 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-06-14 05:24:01 +0000 |
| commit | f6d8aaaacf4a2802d3aaad6d326f9510fdb2ddf7 (patch) | |
| tree | 1bf5601ef3b9e3b02c1570aaa9f9e68e4c77770d /src | |
| parent | 547a7c9cb50d1818c9412d10cca9655503db625c (diff) | |
Add traces for debug
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/boost_system_no_deprecated_test@2542 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a9e8098443114a4fe6e9c19e6410169580c134c6
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 4 | ||||
| -rw-r--r-- | src/cython/CMakeLists.txt | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index 7cd57b25..8f486118 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -10,10 +10,6 @@ find_package(GMP) if(GMP_FOUND) message(STATUS "GMP_LIBRARIES = ${GMP_LIBRARIES}") INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR}) - get_filename_component(lib_we ${GMP_LIBRARIES} NAME_WE) - - message("++ lib_we = ${lib_we}") - find_package(GMPXX) if(GMPXX_FOUND) message(STATUS "GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}") diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 2a0a3844..eff36f93 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -8,6 +8,7 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_ALL_NO_LIB', ") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DBOOST_SYSTEM_NO_DEPRECATED', ") + message("++ Boost_THREAD_LIBRARY=${Boost_THREAD_LIBRARY} - Boost_thread_LIBRARY=${Boost_thread_LIBRARY} - ") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'boost_thread', ") endif() @@ -106,6 +107,7 @@ if(CYTHON_FOUND) if(CGAL_FOUND) # Add CGAL compilation args + message("++ CGAL_LIBRARIES = ${CGAL_LIBRARIES}") if(CGAL_HEADER_ONLY) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") else(CGAL_HEADER_ONLY) @@ -119,10 +121,14 @@ if(CYTHON_FOUND) # GMP and GMPXX are not required, but if present, CGAL will link with them. if(GMP_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMP', ") + get_filename_component(GMP_LIBRARY_FILE_NAME ${GMP_LIBRARIES} NAME_WE) + message("++ GMP_LIBRARY_FILE_NAME = ${GMP_LIBRARY_FILE_NAME}") if(WIN32) - set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'libgmp-10', ") + set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'${GMP_LIBRARY_FILE_NAME}', ") else(WIN32) - set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'gmp', ") + STRING(REGEX REPLACE "lib" "" UNIX_GMP_LIBRARY_FILE_NAME ${GMP_LIBRARY_FILE_NAME}) + message("++ UNIX_GMP_LIBRARY_FILE_NAME = ${UNIX_GMP_LIBRARY_FILE_NAME}") + set(GUDHI_CYTHON_LIBRARIES "${GUDHI_CYTHON_LIBRARIES}'${UNIX_GMP_LIBRARY_FILE_NAME}', ") endif(WIN32) set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ") if(GMPXX_FOUND) |