Skip to content

Commit c049962

Browse files
fix architecture
1 parent bec067e commit c049962

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

patch/ros-jazzy-rviz-ogre-vendor.patch

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 8d23a299a..f58c62831 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -76,7 +76,11 @@ endif()
6+
7+
if(APPLE)
8+
list(APPEND OGRE_CMAKE_ARGS -DOGRE_ENABLE_PRECOMPILED_HEADERS:BOOL=OFF)
9+
- list(APPEND OGRE_CMAKE_ARGS -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64)
10+
+ if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64")
11+
+ list(APPEND OGRE_CMAKE_ARGS "-DCMAKE_OSX_ARCHITECTURES='arm64'")
12+
+ else()
13+
+ list(APPEND OGRE_CMAKE_ARGS "-DCMAKE_OSX_ARCHITECTURES='x86_64'")
14+
+ endif()
15+
endif()
16+
17+
ament_vendor(ogre_vendor
118
diff --git a/patches/0005-fix-macos-arm64.patch b/patches/0005-fix-macos-arm64.patch
219
new file mode 100644
320
index 000000000..9494cc9ae

0 commit comments

Comments
 (0)