mirror of
https://github.com/introlab/rtabmap.git
synced 2026-10-04 00:57:46 +08:00
OpenGV macos eigen version error
This commit is contained in:
@@ -171,7 +171,7 @@ runs:
|
|||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ${{ runner.temp }}/deps-stage/opengv
|
path: ${{ runner.temp }}/deps-stage/opengv
|
||||||
key: opengv-91f4b19c-usrlocal-${{ inputs.os }}-${{ hashFiles('.github/actions/install-macos-source-deps/patches/opengv-91f4b19c-disable-march-native.patch') }}-${{ steps.depver.outputs.hash }}
|
key: opengv-91f4b19c-usrlocal-${{ inputs.os }}-${{ hashFiles('.github/actions/install-macos-source-deps/patches/opengv-91f4b19c-macos.patch') }}-${{ steps.depver.outputs.hash }}
|
||||||
|
|
||||||
- name: Build opengv
|
- name: Build opengv
|
||||||
if: steps.cache-opengv.outputs.cache-hit != 'true'
|
if: steps.cache-opengv.outputs.cache-hit != 'true'
|
||||||
@@ -189,7 +189,7 @@ runs:
|
|||||||
git checkout 91f4b19c73450833a40e463ad3648aae80b3a7f3
|
git checkout 91f4b19c73450833a40e463ad3648aae80b3a7f3
|
||||||
# Disable the -march=native/armv7-a/armv8-a flags so it builds portably on
|
# Disable the -march=native/armv7-a/armv8-a flags so it builds portably on
|
||||||
# both Intel and Apple Silicon runners.
|
# both Intel and Apple Silicon runners.
|
||||||
git apply "$PATCHES/opengv-91f4b19c-disable-march-native.patch"
|
git apply "$PATCHES/opengv-91f4b19c-macos.patch"
|
||||||
# CMAKE_POLICY_VERSION_MINIMUM=3.5: opengv declares an ancient
|
# CMAKE_POLICY_VERSION_MINIMUM=3.5: opengv declares an ancient
|
||||||
# cmake_minimum_required that modern CMake rejects. EIGEN_INCLUDE_DIR points
|
# cmake_minimum_required that modern CMake rejects. EIGEN_INCLUDE_DIR points
|
||||||
# opengv's bundled FindEigen at Homebrew's eigen (covers /opt/homebrew on arm64).
|
# opengv's bundled FindEigen at Homebrew's eigen (covers /opt/homebrew on arm64).
|
||||||
|
|||||||
-20
@@ -1,20 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 9660f55..ca01034 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -31,12 +31,12 @@ IF(MSVC)
|
|
||||||
add_definitions(-D_USE_MATH_DEFINES)
|
|
||||||
ELSE()
|
|
||||||
IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)|(aarch64)|(AARCH64)")
|
|
||||||
- add_definitions (-march=armv8-a)
|
|
||||||
+ #add_definitions (-march=armv8-a)
|
|
||||||
ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES
|
|
||||||
"(arm)|(ARM)|(armhf)|(ARMHF)|(armel)|(ARMEL)")
|
|
||||||
- add_definitions (-march=armv7-a)
|
|
||||||
+ #add_definitions (-march=armv7-a)
|
|
||||||
ELSE ()
|
|
||||||
- add_definitions (-march=native) #TODO use correct c++11 def once everybody has moved to gcc 4.7 # for now I even removed std=gnu++0x
|
|
||||||
+ #add_definitions (-march=native) #TODO use correct c++11 def once everybody has moved to gcc 4.7 # for now I even removed std=gnu++0x
|
|
||||||
ENDIF()
|
|
||||||
add_definitions (
|
|
||||||
-O3
|
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 9660f55..ca01034 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -31,12 +31,12 @@ IF(MSVC)
|
||||||
|
add_definitions(-D_USE_MATH_DEFINES)
|
||||||
|
ELSE()
|
||||||
|
IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)|(aarch64)|(AARCH64)")
|
||||||
|
- add_definitions (-march=armv8-a)
|
||||||
|
+ #add_definitions (-march=armv8-a)
|
||||||
|
ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES
|
||||||
|
"(arm)|(ARM)|(armhf)|(ARMHF)|(armel)|(ARMEL)")
|
||||||
|
- add_definitions (-march=armv7-a)
|
||||||
|
+ #add_definitions (-march=armv7-a)
|
||||||
|
ELSE ()
|
||||||
|
- add_definitions (-march=native) #TODO use correct c++11 def once everybody has moved to gcc 4.7 # for now I even removed std=gnu++0x
|
||||||
|
+ #add_definitions (-march=native) #TODO use correct c++11 def once everybody has moved to gcc 4.7 # for now I even removed std=gnu++0x
|
||||||
|
ENDIF()
|
||||||
|
add_definitions (
|
||||||
|
-O3
|
||||||
|
diff --git a/modules/FindEigen.cmake b/modules/FindEigen.cmake
|
||||||
|
index 126f4a0..39b5524 100644
|
||||||
|
--- a/modules/FindEigen.cmake
|
||||||
|
+++ b/modules/FindEigen.cmake
|
||||||
|
@@ -30,7 +30,13 @@ if(NOT Eigen_FIND_VERSION)
|
||||||
|
endif(NOT Eigen_FIND_VERSION)
|
||||||
|
|
||||||
|
macro(_eigen3_check_version)
|
||||||
|
- file(READ "${EIGEN_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
|
||||||
|
+ # Since Eigen 5.0.0 the version macros moved from Eigen/src/Core/util/Macros.h
|
||||||
|
+ # to a dedicated Eigen/Version header, so check the new location first.
|
||||||
|
+ if(EXISTS "${EIGEN_INCLUDE_DIR}/Eigen/Version")
|
||||||
|
+ file(READ "${EIGEN_INCLUDE_DIR}/Eigen/Version" _eigen3_version_header)
|
||||||
|
+ else()
|
||||||
|
+ file(READ "${EIGEN_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
|
||||||
|
+ endif()
|
||||||
|
|
||||||
|
string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
|
||||||
|
set(EIGEN_WORLD_VERSION "${CMAKE_MATCH_1}")
|
||||||
Reference in New Issue
Block a user