Skip to content

Commit b90f6aa

Browse files
committed
Bump eigen to v5.0.0
Also update the installation directory in the cmake build to just usr-host/include. Otherwise, it will install to usr-host/include/eigen3 and we'd need to add extra flags to find the headers. [ci skip]
1 parent 1f1bb85 commit b90f6aa

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

M2/cmake/build-libraries.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ else()
147147
set(EIGEN_BUILD_TYPE Release)
148148
endif()
149149
ExternalProject_Add(build-eigen
150-
URL https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.bz2
151-
URL_HASH SHA256=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626
150+
URL https://gitlab.com/libeigen/eigen/-/archive/5.0.0/eigen-5.0.0.tar.bz2
151+
URL_HASH SHA256=bdca0ec740fb83be21fe038699923f4c589ead9ab904f4058a9c97752e60d50b
152152
PREFIX libraries/eigen
153153
BINARY_DIR libraries/eigen/build
154154
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/BUILD/tarfiles
@@ -157,6 +157,7 @@ ExternalProject_Add(build-eigen
157157
-DBUILD_TESTING=${BUILD_TESTING}
158158
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
159159
-DCMAKE_CXX_FLAGS=${CXXFLAGS}
160+
-DINCLUDE_INSTALL_DIR:PATH=include
160161
INSTALL_COMMAND ${CMAKE_COMMAND} --install . ${strip_setting}
161162
COMMAND ${CMAKE_COMMAND} -E make_directory ${M2_INSTALL_LICENSESDIR}/eigen
162163
COMMAND ${CMAKE_COMMAND} -E copy_if_different ../src/build-eigen/COPYING.MPL2 ${M2_INSTALL_LICENSESDIR}/eigen

M2/libraries/eigen/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
HOMEPAGE = https://eigen.tuxfamily.org/
2-
VERSION = 3.4.0
2+
VERSION = 5.0.0
33
URL = https://gitlab.com/libeigen/eigen/-/archive/$(VERSION)
44
TARFILE = eigen-$(VERSION).tar.gz
55
LICENSEFILES = COPYING.* README.md

0 commit comments

Comments
 (0)