From 1f455f621d4ee8bfb51c03fca9053f6ed43a666c Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Mon, 7 Jul 2014 14:18:04 +0200 Subject: [PATCH] Fix Eigen detection --- .../benchmark/Triangulation/CMakeLists.txt | 14 ++++++------- .../examples/Triangulation/CMakeLists.txt | 20 ++++++++++--------- .../test/Triangulation/CMakeLists.txt | 20 ++++++++++++------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/Triangulation/benchmark/Triangulation/CMakeLists.txt b/Triangulation/benchmark/Triangulation/CMakeLists.txt index 88f121d4858..187e084ef51 100644 --- a/Triangulation/benchmark/Triangulation/CMakeLists.txt +++ b/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} ) + include_directories (BEFORE "../../include") + include_directories (BEFORE "include") + 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() - include_directories (BEFORE "../../include") - - include_directories (BEFORE "include") - - create_single_source_cgal_program( "delaunay.cpp" ) - else() - message(STATUS "This program requires the CGAL library, and will not be compiled.") - endif() diff --git a/Triangulation/examples/Triangulation/CMakeLists.txt b/Triangulation/examples/Triangulation/CMakeLists.txt index be092a61b5b..d8c08e4e624 100644 --- a/Triangulation/examples/Triangulation/CMakeLists.txt +++ b/Triangulation/examples/Triangulation/CMakeLists.txt @@ -20,20 +20,22 @@ if ( CGAL_FOUND ) include( ${CGAL_USE_FILE} ) include( CGAL_CreateSingleSourceCGALProgram ) - + find_package(Eigen3 3.1.0) if (EIGEN3_FOUND) include( ${EIGEN3_USE_FILE} ) + 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" ) + + else() + message(STATUS "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled.") endif() - 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" ) - else() message(STATUS "This program requires the CGAL library, and will not be compiled.") diff --git a/Triangulation/test/Triangulation/CMakeLists.txt b/Triangulation/test/Triangulation/CMakeLists.txt index 1084b1e7e3a..828910abcc2 100644 --- a/Triangulation/test/Triangulation/CMakeLists.txt +++ b/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()