From 0a19d977eb5528bfc917bd6fa606951f1b58e8d0 Mon Sep 17 00:00:00 2001 From: JMoore5353 Date: Fri, 1 Mar 2024 11:44:21 -0700 Subject: [PATCH 1/2] Updated CMakeLists to skip rosflight_sim if on arm64 --- rosflight_sim/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rosflight_sim/CMakeLists.txt b/rosflight_sim/CMakeLists.txt index efa0f9b..c002014 100644 --- a/rosflight_sim/CMakeLists.txt +++ b/rosflight_sim/CMakeLists.txt @@ -14,6 +14,12 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif(NOT CMAKE_BUILD_TYPE) +# Since Gazebo doesn't have an arm64 target, skip this package if +# architecture is arm64 +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") + return() +endif() + find_package(ament_cmake REQUIRED) find_package(rclcpp REQUIRED) find_package(gazebo_dev) From 51fb817a3520cd9ec3eb68cb6f1489e5a961ad15 Mon Sep 17 00:00:00 2001 From: Jacob Moore Date: Fri, 8 Mar 2024 11:13:16 -0700 Subject: [PATCH 2/2] CMakeLists will now check for architecture and selectively compile rosflight_sim on non-arm64 architectures --- rosflight_sim/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rosflight_sim/CMakeLists.txt b/rosflight_sim/CMakeLists.txt index c002014..6e257a4 100644 --- a/rosflight_sim/CMakeLists.txt +++ b/rosflight_sim/CMakeLists.txt @@ -16,7 +16,8 @@ endif(NOT CMAKE_BUILD_TYPE) # Since Gazebo doesn't have an arm64 target, skip this package if # architecture is arm64 -if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") +message(${CMAKE_SYSTEM_PROCESSOR}) +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") return() endif()