From 705e0b13625310438d680a8e89a8efb2e51a96e4 Mon Sep 17 00:00:00 2001 From: Laurent Saboret Date: Fri, 25 Jan 2008 17:51:55 +0000 Subject: [PATCH] Redo r41603 and r41552 (#ifdef CGAL_USE_TAUCS) for SP --- Surface_mesh_parameterization/include/CGAL/Taucs_fix.h | 4 +++- Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h | 5 +++++ .../include/CGAL/Taucs_solver_traits.h | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Surface_mesh_parameterization/include/CGAL/Taucs_fix.h b/Surface_mesh_parameterization/include/CGAL/Taucs_fix.h index 57272c124ab..f55e1e9b9e1 100644 --- a/Surface_mesh_parameterization/include/CGAL/Taucs_fix.h +++ b/Surface_mesh_parameterization/include/CGAL/Taucs_fix.h @@ -20,9 +20,10 @@ #ifndef CGAL_TAUCS_FIX #define CGAL_TAUCS_FIX - #include +#ifdef CGAL_USE_TAUCS + // // Include TAUCS main header taucs.h // @@ -56,5 +57,6 @@ extern "C" { #undef max #endif +#endif // CGAL_USE_TAUCS #endif // CGAL_TAUCS_FIX diff --git a/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h b/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h index 9758bd43c53..36d320ba8fb 100644 --- a/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h +++ b/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h @@ -22,6 +22,9 @@ #define CGAL_TAUCS_MATRIX #include + +#ifdef CGAL_USE_TAUCS + #include @@ -374,4 +377,6 @@ template<> struct Taucs_number { CGAL_END_NAMESPACE +#endif // CGAL_USE_TAUCS + #endif // CGAL_TAUCS_MATRIX diff --git a/Surface_mesh_parameterization/include/CGAL/Taucs_solver_traits.h b/Surface_mesh_parameterization/include/CGAL/Taucs_solver_traits.h index 799836677b4..48062a122be 100644 --- a/Surface_mesh_parameterization/include/CGAL/Taucs_solver_traits.h +++ b/Surface_mesh_parameterization/include/CGAL/Taucs_solver_traits.h @@ -22,6 +22,9 @@ #define CGAL_TAUCS_SOLVER_TRAITS #include + +#ifdef CGAL_USE_TAUCS + #include #include #include @@ -234,4 +237,6 @@ private: CGAL_END_NAMESPACE +#endif // CGAL_USE_TAUCS + #endif // CGAL_TAUCS_SOLVER_TRAITS