diff options
| -rw-r--r-- | 0001-adapt-GeographicLib-discovery-for-openEuler.patch | 17 | ||||
| -rw-r--r-- | microstrain-inertial-driver.spec | 5 |
2 files changed, 20 insertions, 2 deletions
diff --git a/0001-adapt-GeographicLib-discovery-for-openEuler.patch b/0001-adapt-GeographicLib-discovery-for-openEuler.patch new file mode 100644 index 0000000..6b05bb2 --- /dev/null +++ b/0001-adapt-GeographicLib-discovery-for-openEuler.patch @@ -0,0 +1,17 @@ +--- a/microstrain_inertial_driver/CMakeLists.txt ++++ b/microstrain_inertial_driver/CMakeLists.txt +@@ -133,9 +133,12 @@ + ########### + + # Find some less ROS-y packages +-list(APPEND CMAKE_MODULE_PATH "/usr/share/cmake/geographiclib/") ++find_package(GeographicLib CONFIG QUIET) ++if(NOT GeographicLib_FOUND) ++ list(APPEND CMAKE_MODULE_PATH "/usr/share/cmake/geographiclib/") ++ find_package(GeographicLib REQUIRED) ++endif() + find_package(Eigen3 REQUIRED) +-find_package(GeographicLib REQUIRED) + + # We want to use the static library for libgeographic, but it doesn't seem to find it for us, so substitute it here + string(REGEX REPLACE "[.]so[^\\/\\s]*$" ".a" GeographicLib_LIBRARIES ${GeographicLib_LIBRARIES}) diff --git a/microstrain-inertial-driver.spec b/microstrain-inertial-driver.spec index 73da647..75f1f23 100644 --- a/microstrain-inertial-driver.spec +++ b/microstrain-inertial-driver.spec @@ -8,6 +8,7 @@ Summary: ROS 2 driver for LORD/MicroStrain inertial products License: MIT URL: https://github.com/LORD-MicroStrain/microstrain_inertial/tree/ros2 Source0: %{RosPkgName}-%{version}-1.tar.gz#/%{RosPkgName}-%{version}-1.tar.gz +Patch0: 0001-adapt-GeographicLib-discovery-for-openEuler.patch %global debug_package %{nil} %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -17,7 +18,7 @@ Source0: %{RosPkgName}-%{version}-1.tar.gz#/%{RosPkgName}-%{version}-1.ta BuildRequires: cmake BuildRequires: git BuildRequires: eigen3-devel -BuildRequires: GeographicLib-devel +BuildRequires: geographiclib-devel BuildRequires: ros-%{ros_distro}-ament-cmake BuildRequires: ros-%{ros_distro}-ros-environment BuildRequires: ros-%{ros_distro}-rosidl-default-generators @@ -69,7 +70,7 @@ ROS 2 driver for LORD/MicroStrain inertial products (GX5, GQ7, CV5, etc.). Provides node and lifecycle node executables built on top of the MIP SDK. %prep -%autosetup -n %{RosPkgName}-%{version}-1 +%autosetup -n %{RosPkgName}-%{version}-1 -p1 %build source /opt/ros/%{ros_distro}/setup.sh 2>/dev/null || true |