GUDHI 2.1.0 as released by upstream in a tarball.upstream/2.1.0

4 files changed, 34 insertions, 8 deletions

diff --git a/cmake/modules/GUDHI_doxygen_target.cmake b/cmake/modules/GUDHI_doxygen_target.cmake
index d2cb952d..f3e2d9f5 100644
--- a/cmake/modules/GUDHI_doxygen_target.cmake
+++ b/cmake/modules/GUDHI_doxygen_target.cmake
@@ -3,6 +3,11 @@ find_package(Doxygen)
 if(DOXYGEN_FOUND)
   # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
 
+  #starting from cmake 3.9 the usage of DOXYGEN_EXECUTABLE is deprecated
+  if(TARGET Doxygen::doxygen)
+    get_property(DOXYGEN_EXECUTABLE TARGET Doxygen::doxygen PROPERTY IMPORTED_LOCATION)
+  endif()
+
   add_custom_target(doxygen ${DOXYGEN_EXECUTABLE} ${GUDHI_USER_VERSION_DIR}/Doxyfile
                     WORKING_DIRECTORY ${GUDHI_USER_VERSION_DIR}
                     DEPENDS ${GUDHI_USER_VERSION_DIR}/Doxyfile ${GUDHI_DOXYGEN_DEPENDENCY}
diff --git a/cmake/modules/GUDHI_test_coverage.cmake b/cmake/modules/GUDHI_test_coverage.cmake
index ce171a0e..bea5b2d6 100644
--- a/cmake/modules/GUDHI_test_coverage.cmake
+++ b/cmake/modules/GUDHI_test_coverage.cmake
@@ -8,7 +8,19 @@ if (GPROF_PATH)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
 endif()
 
+if (DEBUG_TRACES)
+  # Make CTest more verbose with DEBUG_TRACES - no XML output
+  set(GUDHI_UT_LOG_LEVEL "--log_level=all")
+  set(GUDHI_UT_REPORT_LEVEL "--report_level=detailed")
+else()
+  set(GUDHI_UT_LOG_FORMAT "--log_format=XML")
+  set(GUDHI_UT_LOG_SINK "--log_sink=${CMAKE_BINARY_DIR}/${unitary_test}_UT.xml")
+  set(GUDHI_UT_LOG_LEVEL "--log_level=test_suite")
+  set(GUDHI_UT_REPORT_LEVEL "--report_level=no")
+endif()
+
 function(gudhi_add_coverage_test unitary_test)
   add_test(NAME ${unitary_test} COMMAND $<TARGET_FILE:${unitary_test}>
-      "--log_format=XML" "--log_sink=${CMAKE_BINARY_DIR}/${unitary_test}_UT.xml" "--log_level=test_suite" "--report_level=no")
+      ${GUDHI_UT_LOG_FORMAT} ${GUDHI_UT_LOG_SINK}
+      ${GUDHI_UT_LOG_LEVEL} ${GUDHI_UT_REPORT_LEVEL})
 endfunction()
diff --git a/cmake/modules/GUDHI_third_party_libraries.cmake b/cmake/modules/GUDHI_third_party_libraries.cmake
index f2bbafdc..419c2581 100644
--- a/cmake/modules/GUDHI_third_party_libraries.cmake
+++ b/cmake/modules/GUDHI_third_party_libraries.cmake
@@ -1,6 +1,6 @@
 # This files manage third party libraries required by GUDHI
 
-find_package(Boost REQUIRED COMPONENTS system filesystem unit_test_framework program_options thread)
+find_package(Boost 1.48.0 REQUIRED COMPONENTS system filesystem unit_test_framework program_options thread)
 
 if(NOT Boost_FOUND)
   message(FATAL_ERROR "NOTICE: This program requires Boost and will not be compiled.")
@@ -54,10 +54,12 @@ if(CGAL_FOUND)
       endforeach(CGAL_INCLUDE_DIR ${CGAL_INCLUDE_DIRS})
     endif(NOT CGAL_VERSION VERSION_GREATER 4.9.0)
 
-    # For dev version
-    include_directories(BEFORE "src/common/include/gudhi_patches")
-    # For user version
-    include_directories(BEFORE "include/gudhi_patches")
+    if (NOT CGAL_VERSION VERSION_GREATER 4.11.0)
+      # For dev version
+      include_directories(BEFORE "src/common/include/gudhi_patches")
+      # For user version
+      include_directories(BEFORE "include/gudhi_patches")
+    endif (NOT CGAL_VERSION VERSION_GREATER 4.11.0)
   endif()
 endif()
 
@@ -83,7 +85,6 @@ FIND_PROGRAM( GCOVR_PATH gcovr )
 if (GCOVR_PATH)
   message("gcovr found in ${GCOVR_PATH}")
 endif()
-# Required programs for unitary tests purpose
 FIND_PROGRAM( GPROF_PATH gprof )
 if (GPROF_PATH)
   message("gprof found in ${GPROF_PATH}")
@@ -92,6 +93,10 @@ FIND_PROGRAM( DIFF_PATH diff )
 if (DIFF_PATH)
   message("diff found in ${DIFF_PATH}")
 endif()
+FIND_PROGRAM( GNUPLOT_PATH gnuplot )
+if (GNUPLOT_PATH)
+  message("gnuplot found in ${GNUPLOT_PATH}")
+endif()
 
 # BOOST ISSUE result_of vs C++11
 add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
diff --git a/cmake/modules/GUDHI_user_version_target.cmake b/cmake/modules/GUDHI_user_version_target.cmake
index cff64ad2..4abc2574 100644
--- a/cmake/modules/GUDHI_user_version_target.cmake
+++ b/cmake/modules/GUDHI_user_version_target.cmake
@@ -48,7 +48,11 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11)
                      copy_directory ${CMAKE_SOURCE_DIR}/src/GudhUI ${GUDHI_USER_VERSION_DIR}/GudhUI)
   
   set(GUDHI_DIRECTORIES "doc;example;concept;utilities")
-  set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/gudhi_patches")
+  if (NOT CGAL_VERSION VERSION_GREATER 4.11.0)
+    set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/gudhi_patches")
+  else ()
+      set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi")
+  endif ()
 
   foreach(GUDHI_MODULE ${GUDHI_MODULES_FULL_LIST})
     foreach(GUDHI_DIRECTORY ${GUDHI_DIRECTORIES})