Workaround for CGAL version 4.8 compilation issue

New target CGAL_WITH_EIGEN3_VERSION set with CGAL_VERSION when CGAL and Eigen3 found to ease CMakeLists.txt


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cgal_4.8_issue@2241 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 2fbf1f9397aa1549ba05aa26ac6852b882dce147

3 files changed, 32 insertions, 50 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)
diff --git a/src/Tangential_complex/example/CMakeLists.txt b/src/Tangential_complex/example/CMakeLists.txt
index a75ccd5b..47a56e3b 100644
--- a/src/Tangential_complex/example/CMakeLists.txt
+++ b/src/Tangential_complex/example/CMakeLists.txt
@@ -1,23 +1,19 @@
 cmake_minimum_required(VERSION 2.6)
 project(Tangential_complex_examples)
 
-if(CGAL_FOUND)
-  if (NOT CGAL_VERSION VERSION_LESS 4.8.0)
-    if (EIGEN3_FOUND)
-      add_executable( Tangential_complex_example_basic example_basic.cpp )
-      target_link_libraries(Tangential_complex_example_basic ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
-      add_executable( Tangential_complex_example_with_perturb example_with_perturb.cpp )
-      target_link_libraries(Tangential_complex_example_with_perturb ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
-      if (TBB_FOUND)
-        target_link_libraries(Tangential_complex_example_basic ${TBB_LIBRARIES})
-        target_link_libraries(Tangential_complex_example_with_perturb ${TBB_LIBRARIES})
-      endif(TBB_FOUND)
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+  add_executable( Tangential_complex_example_basic example_basic.cpp )
+  target_link_libraries(Tangential_complex_example_basic ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
+  add_executable( Tangential_complex_example_with_perturb example_with_perturb.cpp )
+  target_link_libraries(Tangential_complex_example_with_perturb ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
+  if (TBB_FOUND)
+    target_link_libraries(Tangential_complex_example_basic ${TBB_LIBRARIES})
+    target_link_libraries(Tangential_complex_example_with_perturb ${TBB_LIBRARIES})
+  endif(TBB_FOUND)
 
-      add_test(Tangential_complex_example_basic
-               ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_example_basic)
+  add_test(Tangential_complex_example_basic
+           ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_example_basic)
 
-      add_test(Tangential_complex_example_with_perturb
-               ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_example_with_perturb)
-    endif(EIGEN3_FOUND)
-  endif(NOT CGAL_VERSION VERSION_LESS 4.8.0)
-endif(CGAL_FOUND)
+  add_test(Tangential_complex_example_with_perturb
+           ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_example_with_perturb)
+endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
diff --git a/src/Tangential_complex/test/CMakeLists.txt b/src/Tangential_complex/test/CMakeLists.txt
index 075028c8..b2bf5dd7 100644
--- a/src/Tangential_complex/test/CMakeLists.txt
+++ b/src/Tangential_complex/test/CMakeLists.txt
@@ -10,22 +10,14 @@ if (GPROF_PATH)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
 endif()
 
-if(CGAL_FOUND)
-  if (NOT CGAL_VERSION VERSION_LESS 4.8.0)
-    if (EIGEN3_FOUND)
-      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-      include( ${EIGEN3_USE_FILE} )
-      include_directories (BEFORE "../../include")
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+  add_executable( Tangential_complex_test_TC test_tangential_complex.cpp )
+  target_link_libraries(Tangential_complex_test_TC ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  if (TBB_FOUND)
+    target_link_libraries(Tangential_complex_test_TC ${TBB_LIBRARIES})
+  endif()
+  add_test(Tangential_complex_test_TC ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_test_TC
+  # XML format for Jenkins xUnit plugin
+  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Tangential_complex_UT.xml --log_level=test_suite --report_level=no)
 
-      add_executable( Tangential_complex_test_TC test_tangential_complex.cpp )
-      target_link_libraries(Tangential_complex_test_TC ${CGAL_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-      if (TBB_FOUND)
-        target_link_libraries(Tangential_complex_test_TC ${TBB_LIBRARIES})
-      endif()
-      add_test(Tangential_complex_test_TC ${CMAKE_CURRENT_BINARY_DIR}/Tangential_complex_test_TC
-      # XML format for Jenkins xUnit plugin 
-      --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Tangential_complex_UT.xml --log_level=test_suite --report_level=no)
-
-    endif()
-  endif ()
-endif()
\ No newline at end of file
+endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)