Skip to content

MacOS: Use x86_64h Architecture #13398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −15
Draft

MacOS: Use x86_64h Architecture #13398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
# set(CMAKE_OSX_SYSROOT "iphoneos")
if(QGC_MACOS_UNIVERSAL_BUILD)
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
set(CMAKE_OSX_ARCHITECTURES "x86_64h;arm64") # CMAKE_APPLE_SILICON_PROCESSOR
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/CustomOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ set(QGC_MACOS_PLIST_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/MacOSXBundleInfo.plis
set(QGC_MACOS_BUNDLE_ID "${QGC_PACKAGE_NAME}" CACHE STRING "MacOS Bundle ID")
set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/qgroundcontrol.icns" CACHE FILEPATH "MacOS Icon Path")
set(QGC_MACOS_ENTITLEMENTS_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/qgroundcontrol.entitlements" CACHE FILEPATH "MacOS Entitlements Path")
option(QGC_MACOS_UNIVERSAL_BUILD "Build MacOS Universal Build (arm64;x86_64)" ON)
option(QGC_MACOS_UNIVERSAL_BUILD "Build MacOS Universal Build (x86_64h;arm64)" ON)

# Linux
option(QGC_CREATE_APPIMAGE "Build an AppImage after build" ON)
Expand Down
6 changes: 0 additions & 6 deletions cmake/Toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,4 @@ endif()

if(APPLE AND NOT IOS)
set(MACOS TRUE)

# if(CMAKE_APPLE_SILICON_PROCESSOR MATCHES "arm64")
# if(CMAKE_APPLE_SILICON_PROCESSOR MATCHES "x86_64")
# if("${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64;x86_64" OR "${CMAKE_OSX_ARCHITECTURES}" MATCHES "x86_64;arm64")
# set(QGC_MACOS_UNIVERSAL_BUILD ON)
# endif()
endif()
7 changes: 0 additions & 7 deletions tools/setup/install-dependencies-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
#!/usr/bin/env bash
#
# QGroundControl build‑time dependencies for Ubuntu/Debian‑based images
# --------------------------------------------------------------------
# * Designed for non‑interactive CI/containers
# * Uses --no-install-recommends to keep the image lean
# * Cleans APT cache at the end to minimise final size

set -euo pipefail
export DEBIAN_FRONTEND=noninteractive

Expand Down
Loading