Skip to content

Tweaked create-dmg usage to be sort of like master, and give better error on missing dependency #13386

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

Merged
merged 3 commits into from
Sep 15, 2025
Merged

Tweaked create-dmg usage to be sort of like master, and give better error on missing dependency #13386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a07dc5
Tweaks to create-dmg checks/usage
DonLakeFlyer Sep 15, 2025
bb57f54
Update to new osx dependency script name
DonLakeFlyer Sep 15, 2025
82538b4
Don't use latest XCode
DonLakeFlyer Sep 15, 2025
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 .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
xcode-version: '<=16.x'

- name: Install Dependencies (include GStreamer)
working-directory: ${{ github.workspace }}/tools/setup
Expand Down
2 changes: 1 addition & 1 deletion cmake/CreateMacDMG.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ file(COPY ${STAGING_BUNDLE_PATH} DESTINATION ${CMAKE_BINARY_DIR}/package)

message(STATUS "Creating DMG: ${TARGET_APP_NAME}.dmg")
execute_process(
COMMAND create-dmg --volname "${TARGET_APP_NAME}" --filesystem "APFS" "${TARGET_APP_NAME}.dmg" "${CMAKE_BINARY_DIR}/package/"
COMMAND ${CREATE_DMG_PROGRAM} --volname "${TARGET_APP_NAME}" --filesystem "APFS" "${TARGET_APP_NAME}.dmg" "${CMAKE_BINARY_DIR}/package/"
COMMAND_ERROR_IS_FATAL ANY
)
5 changes: 5 additions & 0 deletions cmake/Install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ elseif(WIN32)
install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/CreateWinInstaller.cmake")
elseif(MACOS)
install(CODE "set(TARGET_APP_NAME ${QGC_APP_NAME})")
find_program(CREATE_DMG_PROGRAM create-dmg)
if(NOT CREATE_DMG_PROGRAM)
message(FATAL_ERROR "create-dmg not found. Please install it using `sh qgroundcontrol/tools/setup/install-dependencies-osx.sh`")
endif()
install(CODE "set(CREATE_DMG_PROGRAM \"${CREATE_DMG_PROGRAM}\")")
install(CODE "set(MACDEPLOYQT ${Qt6_DIR}/../../../bin/macdeployqt)")
install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/CreateMacDMG.cmake")
endif()
2 changes: 1 addition & 1 deletion docs/en/qgc-dev-guide/getting_started/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ To install Qt:
- **Ubuntu:** `sudo bash ./qgroundcontrol/tools/setup/install-dependencies-debian.sh`
- **Fedora:** `sudo dnf install speech-dispatcher SDL2-devel SDL2 systemd-devel patchelf`
- **Arch Linux:** `pacman -Sy speech-dispatcher patchelf`
- **Mac** `sh qgroundcontrol/tools/setup/macos-dependencies.sh`
- **Mac** `sh qgroundcontrol/tools/setup/install-dependencies-osx.sh`
- **Android** [Setup](https://doc.qt.io/qt-6/android-getting-started.html). JDK17 is required for the latest updated versions. NDK Version: 25.1.8937393
You can confirm it is being used by reviewing the project setting: **Projects > Manage Kits > Devices > Android (tab) > Android Settings > _JDK location_**.
Note: Visit here for more detailed configurations [android.yml](.github/workflows/android.yml)
Expand Down
Loading