From ad3d27467952ce83e24c2a23460d096cc3f60c2c Mon Sep 17 00:00:00 2001 From: Andrea Date: Mon, 24 Mar 2025 14:02:52 +0100 Subject: [PATCH] Update Eigen Requirement ubuntu 22.04 use eigen 3.4. The minimum eigen version is raised to 3.4. Old cmake code is also removed. --- cMake/FindEigen3.cmake | 6 +++--- cMake/FreeCAD_Helpers/SetupEigen.cmake | 13 ++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/cMake/FindEigen3.cmake b/cMake/FindEigen3.cmake index eda8143186..57ee44be2a 100644 --- a/cMake/FindEigen3.cmake +++ b/cMake/FindEigen3.cmake @@ -1,8 +1,8 @@ # - Try to find Eigen3 lib # # This module supports requiring a minimum version, e.g. you can do -# find_package(Eigen3 3.1.2) -# to require version 3.1.2 or newer of Eigen3. +# find_package(Eigen3 3.4.0) +# to require version 3.4.0 or newer of Eigen3. # # Once done this will define # @@ -17,7 +17,7 @@ if(NOT Eigen3_FIND_VERSION) set(Eigen3_FIND_VERSION_MAJOR 3) - set(Eigen3_FIND_VERSION_MINOR 0) + set(Eigen3_FIND_VERSION_MINOR 4) set(Eigen3_FIND_VERSION_PATCH 0) set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") endif(NOT Eigen3_FIND_VERSION) diff --git a/cMake/FreeCAD_Helpers/SetupEigen.cmake b/cMake/FreeCAD_Helpers/SetupEigen.cmake index 492519a9d9..37f6326f8c 100644 --- a/cMake/FreeCAD_Helpers/SetupEigen.cmake +++ b/cMake/FreeCAD_Helpers/SetupEigen.cmake @@ -11,19 +11,10 @@ macro(SetupEigen) "=================\n") endif(NOT EIGEN3_FOUND) - if (EIGEN3_FOUND AND ${EIGEN3_VERSION} VERSION_LESS "3.3.1") + if (EIGEN3_FOUND AND ${EIGEN3_VERSION} VERSION_LESS "3.4.0") message(WARNING "Disable module flatmesh because it requires " - "minimum Eigen3 version 3.3.1 but version ${EIGEN3_VERSION} was found") + "minimum Eigen3 version 3.4.0 but version ${EIGEN3_VERSION} was found") set (BUILD_FLAT_MESH OFF) endif() - # Older versions raise the warning -Wdeprecated-copy with clang10/gcc10 - if (EIGEN3_FOUND AND ${EIGEN3_VERSION} VERSION_LESS "3.3.8") - unset(_flag_found CACHE) - check_cxx_compiler_flag("-Wno-deprecated-copy" _flag_found) - if (_flag_found) - set (EIGEN3_NO_DEPRECATED_COPY "-Wno-deprecated-copy") - endif () - endif() - endmacro(SetupEigen)