diff --git a/Eigen/Sparse b/Eigen/Sparse index bdc45610d..67a4060c9 100644 --- a/Eigen/Sparse +++ b/Eigen/Sparse @@ -11,6 +11,10 @@ #include #include +#ifdef EIGEN2_SUPPORT +#define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET +#endif + #ifndef EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET #error The sparse module API is not stable yet. To use it anyway, please define the EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET preprocessor token. #endif diff --git a/test/eigen2/CMakeLists.txt b/test/eigen2/CMakeLists.txt index 4b470c869..e71351a6c 100644 --- a/test/eigen2/CMakeLists.txt +++ b/test/eigen2/CMakeLists.txt @@ -46,12 +46,13 @@ ei_add_test(eigen2_newstdvector) if(QT4_FOUND) ei_add_test(eigen2_qtvector " " "${QT_QTCORE_LIBRARY}") endif(QT4_FOUND) -if(NOT EIGEN_DEFAULT_TO_ROW_MAJOR) - ei_add_test(eigen2_sparse_vector) - ei_add_test(eigen2_sparse_basic) - ei_add_test(eigen2_sparse_solvers " " "${SPARSE_LIBS}") - ei_add_test(eigen2_sparse_product) -endif() +# no support for eigen2 sparse module +# if(NOT EIGEN_DEFAULT_TO_ROW_MAJOR) +# ei_add_test(eigen2_sparse_vector) +# ei_add_test(eigen2_sparse_basic) +# ei_add_test(eigen2_sparse_solvers " " "${SPARSE_LIBS}") +# ei_add_test(eigen2_sparse_product) +# endif() ei_add_test(eigen2_swap) ei_add_test(eigen2_visitor) ei_add_test(eigen2_bug_132) diff --git a/test/eigen2/main.h b/test/eigen2/main.h index 5b6c715e7..11cba861e 100644 --- a/test/eigen2/main.h +++ b/test/eigen2/main.h @@ -110,6 +110,7 @@ namespace Eigen #else // EIGEN_DEBUG_ASSERTS + #undef eigen_assert #define eigen_assert(a) \ if( (!(a)) && (!no_more_assert) ) \ { \