diff --git a/CMakeLists.txt b/CMakeLists.txt index 215f65aa7..2cec2d276 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(Eigen) -set(EIGEN_VERSION_NUMBER "2.0-beta3") +set(EIGEN_VERSION_NUMBER "2.0-beta4") #if the svnversion program is absent, this will leave the SVN_REVISION string empty, #but won't stop CMake. @@ -12,7 +12,7 @@ else(EIGEN_SVN_REVISION) set(EIGEN_VERSION "${EIGEN_VERSION_NUMBER}") endif(EIGEN_SVN_REVISION) -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.6.2) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 3160ce7f6..af473ca32 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -28,6 +28,14 @@ #undef minor +#define EIGEN_WORLD_VERSION 2 +#define EIGEN_MAJOR_VERSION 0 +#define EIGEN_MINOR_VERSION 0 + +#define EIGEN_VERSION_AT_LEAST(x,y,z) (EIGEN_WORLD_VERSION>x || (EIGEN_WORLD_VERSION>=x && \ + (EIGEN_MAJOR_VERSION>y || (EIGEN_MAJOR_VERSION>=y && \ + EIGEN_MINOR_VERSION>=z)))) + #ifdef EIGEN_DEFAULT_TO_ROW_MAJOR #define EIGEN_DEFAULT_MATRIX_STORAGE_ORDER_OPTION Matrix_RowMajor #else diff --git a/bench/btl/CMakeLists.txt b/bench/btl/CMakeLists.txt index b6afc86ed..3f44e7c70 100644 --- a/bench/btl/CMakeLists.txt +++ b/bench/btl/CMakeLists.txt @@ -1,6 +1,6 @@ PROJECT(BTL) -CMAKE_MINIMUM_REQUIRED(VERSION 2.4) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) include(MacroOptionalAddSubdirectory)