From e1caa847d6c0de60812a5246437e7702605cb7e8 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 28 Apr 2015 07:21:41 +0000
Subject: compile fixed

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

Former-commit-id: fb750b7fb681685a59ddad6c3bbb66970379de3d
---
 src/Witness_complex/example/CMakeLists.txt | 52 ++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 13 deletions(-)

(limited to 'src/Witness_complex/example/CMakeLists.txt')

diff --git a/src/Witness_complex/example/CMakeLists.txt b/src/Witness_complex/example/CMakeLists.txt
index fa594de7..315ffc36 100644
--- a/src/Witness_complex/example/CMakeLists.txt
+++ b/src/Witness_complex/example/CMakeLists.txt
@@ -25,17 +25,43 @@ project(GUDHIWitnessComplex)
 
 # An example with Simplex-tree using CGAL alpha_shapes_3
 
-include( ${CGAL_USE_FILE} )
-find_package(Eigen3 3.1.0)
-if(GMP_FOUND AND CGAL_FOUND)
-   message("CGAL_lib = ${CGAL_LIBRARIES_DIR}")
-   message("GMP_LIBRARIES = ${GMP_LIBRARIES}")
-   message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
-   #message("EIGEN3_LIBRARIES = ${EIGEN3_LIBRARIES}")
-   INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS})
-   INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
-   INCLUDE_DIRECTORIES(${CGAL_INCLUDE_DIRS})
-   add_executable (witness_complex_knn_landmarks witness_complex_knn_landmarks.cpp )
-   target_link_libraries(witness_complex_knn_landmarks ${EIGEN3_LIBRARIES} ${CGAL_LIBRARY})
-   add_test(witness_complex_knn_landmarks ${CMAKE_CURRENT_BINARY_DIR}/witness_complex_knn_landmarks ${CMAKE_SOURCE_DIR}/data/points/bunny_5000 100)
+#find_package(Eigen3 3.1.0)
+#if(GMP_FOUND AND CGAL_FOUND)
+#   message("CGAL_lib = ${CGAL_LIBRARIES_DIR}")
+#   message("GMP_LIBRARIES = ${GMP_LIBRARIES}")
+#   message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
+#   #message("EIGEN3_LIBRARIES = ${EIGEN3_LIBRARIES}")
+#   INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS})
+#   INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
+#   INCLUDE_DIRECTORIES(${CGAL_INCLUDE_DIRS})
+#   add_executable (witness_complex_knn_landmarks witness_complex_knn_landmarks.cpp )
+#   target_link_libraries(witness_complex_knn_landmarks ${EIGEN3_LIBRARIES} ${CGAL_LIBRARY})
+#   add_test(witness_complex_knn_landmarks ${CMAKE_CURRENT_BINARY_DIR}/witness_complex_knn_landmarks ${CMAKE_SOURCE_DIR}/data/points/bunny_5000 100)
+#endif()
+
+# need CGAL 4.6
+# cmake -DCGAL_DIR=~/workspace/CGAL-4.6-beta1 ../../..
+if(CGAL_FOUND)
+  if (NOT CGAL_VERSION VERSION_LESS 4.6.0)
+    message(STATUS "CGAL version: ${CGAL_VERSION}.")
+
+    include( ${CGAL_USE_FILE} )
+
+    find_package(Eigen3 3.1.0)
+    if (EIGEN3_FOUND)
+      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
+      include( ${EIGEN3_USE_FILE} )
+      include_directories (BEFORE "../../include")
+
+      add_executable ( witness_complex_knn_landmarks witness_complex_knn_landmarks.cpp )
+      target_link_libraries(witness_complex_knn_landmarks ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+      add_test(witness_complex_knn_landmarks ${CMAKE_CURRENT_BINARY_DIR}/witness_complex_knn_landmarks ${CMAKE_SOURCE_DIR}/data/points/bunny_5000 100)
+
+    else()
+      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
+    endif()
+  else()
+    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha shapes feature. Version 4.6.0 is required.")
+  endif ()
 endif()
+
-- 
cgit v1.2.3