[libinterpolate] fix Eigen3 (#50719)

This commit is contained in:
sidy3d 2026-03-26 02:19:18 -04:00 committed by GitHub
parent b9300e1c78
commit 84faa5cf11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 31 additions and 16 deletions

View File

@ -0,0 +1,23 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45550a8..1f98148 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
find_package(Boost REQUIRED)
-find_package(Eigen3 3.3.7 REQUIRED) # v3.3.7 adds support for cmake targets
+find_package(Eigen3 CONFIG REQUIRED)
add_library(Interpolate INTERFACE)
add_library(libInterpolate::Interpolate ALIAS Interpolate)
@@ -117,7 +117,7 @@ file(
WRITE ${CMAKE_CURRENT_BINARY_DIR}/libInterpolateConfig.cmake
"include(CMakeFindDependencyMacro)
find_dependency(Boost)
-find_dependency(Eigen3 3.3.7 REQUIRED)
+find_dependency(Eigen3 CONFIG REQUIRED)
include(\${CMAKE_CURRENT_LIST_DIR}/libInterpolateTargets.cmake)
")
write_basic_package_version_file(

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45550a8..0ebd2c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
find_package(Boost REQUIRED)
-find_package(Eigen3 3.3.7 REQUIRED) # v3.3.7 adds support for cmake targets
+find_package(Eigen3 3.3.7...5 REQUIRED) # v3.3.7 adds support for cmake targets
add_library(Interpolate INTERFACE)
add_library(libInterpolate::Interpolate ALIAS Interpolate)

View File

@ -5,7 +5,7 @@ vcpkg_from_github(
SHA512 25abb4df8ea0648cd9cdd309f2491a9fc2cdbc5af3cc786fec39302680835bb1f29281628dd89323f353d377d9702d9b9f894c85c5cb0aa7cbae5590d05d3e27
HEAD_REF master
PATCHES
0001-support-eigen3-5.patch
0001-fix-eigen3.patch
)
set(VCPKG_BUILD_TYPE release) # header-only port

View File

@ -1,7 +1,7 @@
{
"name": "libinterpolate",
"version": "2.7.2",
"port-version": 1,
"port-version": 2,
"description": "Header-only C++ interpolation library.",
"homepage": "https://github.com/CD3/libInterpolate",
"license": "MIT",

View File

@ -5070,7 +5070,7 @@
},
"libinterpolate": {
"baseline": "2.7.2",
"port-version": 1
"port-version": 2
},
"libirecovery": {
"baseline": "2023-05-13",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d709cc815d23a98233d56f4c6047d8a0c9c559ac",
"version": "2.7.2",
"port-version": 2
},
{
"git-tree": "4b9be387780b7b39b6cd96ef064f9c79201bb1e3",
"version": "2.7.2",