57 lines
2.7 KiB
Diff
57 lines
2.7 KiB
Diff
From 353b4ddf52db48ba85d2efaa33310afa0eb73a72 Mon Sep 17 00:00:00 2001
|
|
From: Kumataro <Kumataro@users.noreply.github.com>
|
|
Date: Sun, 13 Jul 2025 08:11:06 +0900
|
|
Subject: [PATCH 1/2] eigen: fix to get version from eigen master branch
|
|
|
|
---
|
|
cmake/OpenCVFindLibsPerf.cmake | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
|
|
index dfc94597bbba..55a08f72d00d 100644
|
|
--- a/cmake/OpenCVFindLibsPerf.cmake
|
|
+++ b/cmake/OpenCVFindLibsPerf.cmake
|
|
@@ -84,6 +84,12 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
|
|
set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION})
|
|
set(EIGEN_MAJOR_VERSION ${EIGEN3_MAJOR_VERSION})
|
|
set(EIGEN_MINOR_VERSION ${EIGEN3_MINOR_VERSION})
|
|
+ elseif(DEFINED Eigen3_VERSION_MAJOR)
|
|
+ # see https://github.com/opencv/opencv/issues/27530
|
|
+ # Case sensitive is needed to support Eigen on Master branch at 13 July,2025.
|
|
+ set(EIGEN_WORLD_VERSION ${Eigen3_VERSION_MAJOR})
|
|
+ set(EIGEN_MAJOR_VERSION ${Eigen3_VERSION_MINOR})
|
|
+ set(EIGEN_MINOR_VERSION ${Eigen3_VERSION_PATCH})
|
|
else() # Eigen config file
|
|
set(EIGEN_WORLD_VERSION ${EIGEN3_VERSION_MAJOR})
|
|
set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR})
|
|
|
|
From 94e909d4a6811bbd4774baae8722df79d057a2bc Mon Sep 17 00:00:00 2001
|
|
From: Kumataro <Kumataro@users.noreply.github.com>
|
|
Date: Mon, 14 Jul 2025 21:25:52 +0900
|
|
Subject: [PATCH 2/2] add pointer to Eigen commit
|
|
|
|
---
|
|
cmake/OpenCVFindLibsPerf.cmake | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
|
|
index 55a08f72d00d..861a39c47f9b 100644
|
|
--- a/cmake/OpenCVFindLibsPerf.cmake
|
|
+++ b/cmake/OpenCVFindLibsPerf.cmake
|
|
@@ -84,13 +84,13 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
|
|
set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION})
|
|
set(EIGEN_MAJOR_VERSION ${EIGEN3_MAJOR_VERSION})
|
|
set(EIGEN_MINOR_VERSION ${EIGEN3_MINOR_VERSION})
|
|
- elseif(DEFINED Eigen3_VERSION_MAJOR)
|
|
+ elseif(DEFINED Eigen3_VERSION_MAJOR) # Recommended package config variables
|
|
# see https://github.com/opencv/opencv/issues/27530
|
|
- # Case sensitive is needed to support Eigen on Master branch at 13 July,2025.
|
|
set(EIGEN_WORLD_VERSION ${Eigen3_VERSION_MAJOR})
|
|
set(EIGEN_MAJOR_VERSION ${Eigen3_VERSION_MINOR})
|
|
set(EIGEN_MINOR_VERSION ${Eigen3_VERSION_PATCH})
|
|
- else() # Eigen config file
|
|
+ else() # Deprecated package config variables
|
|
+ # Removed on master at https://gitlab.com/libeigen/eigen/-/commit/f2984cd0778dd0a1d7e74216d826eaff2bc6bfab
|
|
set(EIGEN_WORLD_VERSION ${EIGEN3_VERSION_MAJOR})
|
|
set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR})
|
|
set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH})
|