fix architecture

RoboStack · Jan 5, 2025 · c049962 · c049962
1 parent bec067e
commit c049962
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/patch/ros-jazzy-rviz-ogre-vendor.patch b/patch/ros-jazzy-rviz-ogre-vendor.patch
@@ -1,3 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d23a299a..f58c62831 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,11 @@ endif()
+
+ if(APPLE)
+   list(APPEND OGRE_CMAKE_ARGS -DOGRE_ENABLE_PRECOMPILED_HEADERS:BOOL=OFF)
+-  list(APPEND OGRE_CMAKE_ARGS -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64)
++  if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64")
++    list(APPEND OGRE_CMAKE_ARGS "-DCMAKE_OSX_ARCHITECTURES='arm64'")
++  else()
++    list(APPEND OGRE_CMAKE_ARGS "-DCMAKE_OSX_ARCHITECTURES='x86_64'")
++  endif()
+ endif()
+
+ ament_vendor(ogre_vendor
 diff --git a/patches/0005-fix-macos-arm64.patch b/patches/0005-fix-macos-arm64.patch
 new file mode 100644
 index 000000000..9494cc9ae