diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-08-29 15:31:32 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-08-29 15:31:32 +0200 |
| commit | c1d0f15bde4614c3efb84248e5d2ceb9cb995779 (patch) | |
| tree | 9ad0811d85d51d2e6709703f3758e82670bc793d | |
| parent | 124d12a915129bc36ebe87f483712505a11dc91f (diff) | |
Enable evaluators by default
| -rw-r--r-- | Eigen/Core | 11 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | test/evaluators.cpp | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/Eigen/Core b/Eigen/Core index 239bc6990..47c4f6299 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -12,10 +12,13 @@ #define EIGEN_CORE_H // EIGEN_TEST_EVALUATORS => EIGEN_ENABLE_EVALUATORS -#ifdef EIGEN_TEST_EVALUATORS -#ifndef EIGEN_ENABLE_EVALUATORS -#define EIGEN_ENABLE_EVALUATORS -#endif +#ifndef EIGEN_TEST_NO_EVALUATORS + #ifndef EIGEN_TEST_EVALUATORS + #define EIGEN_TEST_EVALUATORS + #endif + #ifndef EIGEN_ENABLE_EVALUATORS + #define EIGEN_ENABLE_EVALUATORS + #endif #endif // first thing Eigen does: stop the compiler from committing suicide diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6446b8bb0..075b8d3de 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -139,10 +139,10 @@ endif(TEST_LIB) set_property(GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT "Official") add_custom_target(BuildOfficial) -option(EIGEN_TEST_EVALUATORS "Enable work in progress evaluators" OFF) -if(EIGEN_TEST_EVALUATORS) - add_definitions("-DEIGEN_TEST_EVALUATORS=1") -endif(EIGEN_TEST_EVALUATORS) +option(EIGEN_TEST_NO_EVALUATORS "Disable evaluators in unit tests" OFF) +if(EIGEN_TEST_NO_EVALUATORS) + add_definitions("-DEIGEN_TEST_NO_EVALUATORS=1") +endif(EIGEN_TEST_NO_EVALUATORS) ei_add_test(meta) ei_add_test(sizeof) diff --git a/test/evaluators.cpp b/test/evaluators.cpp index 305047a6a..2ca453b1c 100644 --- a/test/evaluators.cpp +++ b/test/evaluators.cpp @@ -7,6 +7,10 @@ #undef EIGEN_TEST_EVALUATORS #endif +#ifdef EIGEN_TEST_NO_EVALUATORS +#undef EIGEN_TEST_NO_EVALUATORS +#endif + #include "main.h" namespace Eigen { |