Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update eigen to 3.4.0 #138

Merged
merged 2 commits into from
Feb 7, 2024
Merged

update eigen to 3.4.0 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779f10c
update eigen to 3.4.0
timosachsenberg Feb 7, 2024
f1d12cd
maybe patches not needed anymore
timosachsenberg Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ set(XERCES_DIR ${CONTRIB_BIN_SOURCE_DIR}/Xerces-C_3_2_0)
set(LIBSVM_DIR ${CONTRIB_BIN_SOURCE_DIR}/libsvm-3.12)
set(GLPK_DIR ${CONTRIB_BIN_SOURCE_DIR}/glpk-4.46)
set(COINOR_DIR ${CONTRIB_BIN_SOURCE_DIR}/CoinMP-1.8.3)
set(EIGEN_DIR ${CONTRIB_BIN_SOURCE_DIR}/eigen-eigen-5a0156e40feb)
set(EIGEN_DIR ${CONTRIB_BIN_SOURCE_DIR}/eigen-3.4.0)
set(KISSFFT_DIR ${CONTRIB_BIN_SOURCE_DIR}/kissfft)
set(HDF5_DIR ${CONTRIB_BIN_SOURCE_DIR}/hdfsrc)
set(OPENMP_DIR ${CONTRIB_BIN_SOURCE_DIR}/openmp-12.0.1.src)
Expand Down Expand Up @@ -258,9 +258,9 @@ set(ARCHIVE_COINOR CoinMP-1.8.3-vs22.tar.gz)
set(ARCHIVE_COINOR_TAR CoinMP-1.8.3-vs22.tar)
set(ARCHIVE_COINOR_SHA1 "252aabfa824a2656e7abbc14278a61e02fe63e48")

set(ARCHIVE_EIGEN eigen-3.3.4.tar.gz)
set(ARCHIVE_EIGEN_TAR eigen-3.3.4.tar)
set(ARCHIVE_EIGEN_SHA1 "c507baf81050b447ed00e972728170938a36d5b0")
set(ARCHIVE_EIGEN eigen-3.4.0.tar.gz)
set(ARCHIVE_EIGEN_TAR eigen-3.4.0.tar)
set(ARCHIVE_EIGEN_SHA1 "d222db69a9e87d9006608e029d1039039f360b52")

set(ARCHIVE_KISSFFT kissfft-130.tar.gz)
set(ARCHIVE_KISSFFT_TAR kissfft-130.tar)
Expand Down
12 changes: 0 additions & 12 deletions libraries.cmake/eigen.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ macro( OPENMS_CONTRIB_BUILD_EIGEN )
endif()
OPENMS_SMARTEXTRACT(ZIP_ARGS ARCHIVE_EIGEN "EIGEN" "CMakeLists.txt")

# disable testing using blas libraries
set(_PATCH_FILE "${PATCH_DIR}/eigen/CMakeLists.txt.patch")
set(_PATCHED_FILE "${EIGEN_DIR}/CMakeLists.txt")
OPENMS_PATCH( _PATCH_FILE EIGEN_DIR _PATCHED_FILE)

set(_PATCH_FILE "${PATCH_DIR}/eigen/blasCMakeLists.txt.patch")
set(_PATCHED_FILE "${EIGEN_DIR}/blas/CMakeLists.txt")
OPENMS_PATCH( _PATCH_FILE EIGEN_DIR _PATCHED_FILE)
set(_PATCH_FILE "${PATCH_DIR}/eigen/unsupportedCMakeLists.txt.patch")
set(_PATCHED_FILE "${EIGEN_DIR}/unsupported/CMakeLists.txt")
OPENMS_PATCH( _PATCH_FILE EIGEN_DIR _PATCHED_FILE)

# eigen doesn't allow insource builds
set(_EIGEN_BUILD_DIR "${EIGEN_DIR}/build")
file(TO_NATIVE_PATH "${_EIGEN_BUILD_DIR}" _EIGEN_NATIVE_BUILD_DIR)
Expand Down
40 changes: 0 additions & 40 deletions patches/eigen/CMakeLists.txt.patch
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions patches/eigen/blasCMakeLists.txt.patch
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions patches/eigen/unsupportedCMakeLists.txt.patch
View file
Open in desktop

This file was deleted.

Loading