Minor Adjustments to Linux & MacOS Deployment

Author: HTRamsey

.github/workflows/macos.yml

@@ -86,8 +86,8 @@ jobs:
 
       - name: Configure
         working-directory: ${{ runner.temp }}/build
-        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
-              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
+        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja \
+              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }} \
               -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
 
       - name: Build

CMakeLists.txt

@@ -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()
 

cmake/CustomOptions.cmake

@@ -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)

cmake/Toolchain.cmake

@@ -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()

tools/setup/install-dependencies-debian.sh

@@ -17,6 +17,7 @@ apt-get install -y -qq --no-install-recommends \
 
 # Enable the “universe” component (needed for several dev packages)
 add-apt-repository -y universe
+add-apt-repository -y ppa:ubuntu-toolchain-r/test
 apt-get update -y -qq
 
 # --------------------------------------------------------------------
@@ -34,7 +35,9 @@ apt-get install -y -qq --no-install-recommends \
     git \
     libfuse2 \
     fuse3 \
+    libc6 \
     libtool \
+    libstdc++6 \
     locales \
     mold \
     ninja-build \