From 70960dc646b6cfa396584ab4997aeef76424154d Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 24 Mar 2017 23:13:48 +0000
Subject: 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
---
 src/Bottleneck_distance/test/CMakeLists.txt | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/Bottleneck_distance/test')

diff --git a/src/Bottleneck_distance/test/CMakeLists.txt b/src/Bottleneck_distance/test/CMakeLists.txt
index 3e61f4cf..3d8e1f95 100644
--- a/src/Bottleneck_distance/test/CMakeLists.txt
+++ b/src/Bottleneck_distance/test/CMakeLists.txt
@@ -11,19 +11,15 @@ if (GPROF_PATH)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
 endif()
 
-# requires CGAL 4.8
-# cmake -DCGAL_DIR=~/workspace/CGAL-4.8 ../../..
-if(CGAL_FOUND)
-  if (NOT CGAL_VERSION VERSION_LESS 4.8.0)
-    add_executable ( bottleneckUT bottleneck_unit_test.cpp )
-    target_link_libraries(bottleneckUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-    if (TBB_FOUND)
-      target_link_libraries(bottleneckUT ${TBB_LIBRARIES})
-    endif(TBB_FOUND)
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+  add_executable ( bottleneckUT bottleneck_unit_test.cpp )
+  target_link_libraries(bottleneckUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  if (TBB_FOUND)
+    target_link_libraries(bottleneckUT ${TBB_LIBRARIES})
+  endif(TBB_FOUND)
 
-    # Unitary tests
-    add_test(NAME bottleneckUT COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bottleneckUT
-      # XML format for Jenkins xUnit plugin
-      --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/bottleneckUT.xml --log_level=test_suite --report_level=no)
-  endif ()
-endif()
+  # Unitary tests
+  add_test(NAME bottleneckUT COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bottleneckUT
+    # XML format for Jenkins xUnit plugin
+    --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/bottleneckUT.xml --log_level=test_suite --report_level=no)
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
-- 
cgit v1.2.3