diff options
| author | Gard Spreemann <gspreemann@gmail.com> | 2018-02-02 14:03:28 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspreemann@gmail.com> | 2018-02-02 14:03:28 +0100 |
| commit | 8e51c74d8855a641c006765ee246402e218828f3 (patch) | |
| tree | fcd070128c18c0b8cb16c841911c2fba3e209e96 /cmake/modules/GUDHI_third_party_libraries.cmake | |
| parent | 0b7c2ce340ece752c4d1b799a94419ca248eb71f (diff) | |
| parent | 9899ae167f281d10b1684dfcd02c6838c5bf28df (diff) | |
Merge branch 'upstream/latest' into dfsg/latest
Diffstat (limited to 'cmake/modules/GUDHI_third_party_libraries.cmake')
| -rw-r--r-- | cmake/modules/GUDHI_third_party_libraries.cmake | 17 |
1 files changed, 11 insertions, 6 deletions
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) |