diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-24 23:33:35 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-24 23:33:35 +0000 |
commit | 6ed42daddfede2288bc02ab2e98fc12b47cac74e (patch) | |
tree | 4f755cd70e7745164f31f1f5f0941dc8284c331d /src/Tangential_complex/benchmark | |
parent | 472bfd399cd1c29a03d20cc5cffe56dfb263717c (diff) | |
parent | 70960dc646b6cfa396584ab4997aeef76424154d (diff) |
Merge cgal_4.8_issue branch into the trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2242 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 094b70b4141e7456651263b1619240aff6a5d562
Diffstat (limited to 'src/Tangential_complex/benchmark')
-rw-r--r-- | src/Tangential_complex/benchmark/CMakeLists.txt | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/Tangential_complex/benchmark/CMakeLists.txt b/src/Tangential_complex/benchmark/CMakeLists.txt index 788c2b4d..ef772be8 100644 --- a/src/Tangential_complex/benchmark/CMakeLists.txt +++ b/src/Tangential_complex/benchmark/CMakeLists.txt @@ -1,17 +1,11 @@ cmake_minimum_required(VERSION 2.6) project(Tangential_complex_benchmark) -# need CGAL 4.8 -if(CGAL_FOUND) - if (NOT CGAL_VERSION VERSION_LESS 4.8.0) - if (EIGEN3_FOUND) - add_executable(Tangential_complex_benchmark benchmark_tc.cpp) - target_link_libraries(Tangential_complex_benchmark - ${Boost_DATE_TIME_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY}) - if (TBB_FOUND) - target_link_libraries(Tangential_complex_benchmark ${TBB_LIBRARIES}) - endif(TBB_FOUND) - endif(EIGEN3_FOUND) - endif (NOT CGAL_VERSION VERSION_LESS 4.8.0) -endif(CGAL_FOUND) - +if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) + add_executable(Tangential_complex_benchmark benchmark_tc.cpp) + target_link_libraries(Tangential_complex_benchmark + ${Boost_DATE_TIME_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY}) + if (TBB_FOUND) + target_link_libraries(Tangential_complex_benchmark ${TBB_LIBRARIES}) + endif(TBB_FOUND) +endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) |