Fix Eigen detection

Author: cjamin

Triangulation/benchmark/Triangulation/CMakeLists.txt

@@ -24,17 +24,15 @@ if ( CGAL_FOUND )
   find_package(Eigen3 3.1.0) 
   if (EIGEN3_FOUND) 
     include( ${EIGEN3_USE_FILE} ) 
-  endif()
-
-  include_directories (BEFORE "../../include")
-
+    include_directories (BEFORE "../../include")
     include_directories (BEFORE "include")
+    create_single_source_cgal_program( "delaunay.cpp" )
 
-  create_single_source_cgal_program( "delaunay.cpp" )
+  else()
+    message(STATUS "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled.")
+  endif()
 
 else()
-  
     message(STATUS "This program requires the CGAL library, and will not be compiled.")
-  
 endif()
 

Triangulation/examples/Triangulation/CMakeLists.txt

@@ -20,19 +20,21 @@ if ( CGAL_FOUND )
   include( ${CGAL_USE_FILE} )
 
   include( CGAL_CreateSingleSourceCGALProgram )
-
+  
   find_package(Eigen3 3.1.0) 
   if (EIGEN3_FOUND) 
     include( ${EIGEN3_USE_FILE} ) 
-  endif()
+    include_directories (BEFORE "../../include")
 
-  include_directories (BEFORE "../../include")
+    create_single_source_cgal_program( "barycentric_subdivision.cpp" )
+    create_single_source_cgal_program( "delaunay_triangulation.cpp" )
+    create_single_source_cgal_program( "triangulation.cpp" )
+    create_single_source_cgal_program( "triangulation_data_structure_dynamic.cpp" )
+    create_single_source_cgal_program( "triangulation_data_structure_static.cpp" )
 
-  create_single_source_cgal_program( "barycentric_subdivision.cpp" )
-  create_single_source_cgal_program( "delaunay_triangulation.cpp" )
-  create_single_source_cgal_program( "triangulation.cpp" )
-  create_single_source_cgal_program( "triangulation_data_structure_dynamic.cpp" )
-  create_single_source_cgal_program( "triangulation_data_structure_static.cpp" )
+  else()
+    message(STATUS "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled.")
+  endif()
 
 else()
 

Triangulation/test/Triangulation/CMakeLists.txt

@@ -25,15 +25,21 @@ if ( CGAL_FOUND )
   if (EIGEN3_FOUND) 
     include( ${EIGEN3_USE_FILE} ) 
   endif()
-
-  include_directories (BEFORE "../../include")
-
+  
+  find_package(Eigen3 3.1.0) 
+  if (EIGEN3_FOUND) 
+    include( ${EIGEN3_USE_FILE} ) 
+    include_directories (BEFORE "../../include")
     include_directories (BEFORE "include")
 
-  create_single_source_cgal_program( "test_delaunay.cpp" )
-  create_single_source_cgal_program( "test_tds.cpp" )
-  create_single_source_cgal_program( "test_torture.cpp" )
-  create_single_source_cgal_program( "test_triangulation.cpp" )
+    create_single_source_cgal_program( "test_delaunay.cpp" )
+    create_single_source_cgal_program( "test_tds.cpp" )
+    create_single_source_cgal_program( "test_torture.cpp" )
+    create_single_source_cgal_program( "test_triangulation.cpp" )
+
+  else()
+    message(STATUS "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled.")
+  endif()
 
 else()