fix(macOS): Remove TARGETED_DEVICE_FAMILY - #9510
Conversation
github-project-automation
Bot
moved this to 🧭 Planning evaluation (don't pick)
in 💻 Desktop Clients team
|
/backport to stable-33.0 |
i2h3
moved this from 🧭 Planning evaluation (don't pick)
to 🏗️ In progress
in 💻 Desktop Clients team
There was a problem hiding this comment.
Pull request overview
This pull request fixes macOS build issues related to RPATH handling and Xcode project configuration. While the title focuses on removing TARGETED_DEVICE_FAMILY, the primary changes address RPATH deletion failures that occur when using macdeployqt.
Changes:
- Added BUILD_WITH_INSTALL_RPATH property to macOS targets to prevent CMake from attempting to delete RPATHs that macdeployqt has already modified
- Removed inappropriate TARGETED_DEVICE_FAMILY setting from Xcode project (iOS/tvOS-specific setting not applicable to macOS targets)
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/gui/CMakeLists.txt | Added BUILD_WITH_INSTALL_RPATH property to nextcloud target with detailed explanation of why it's needed for macdeployqt compatibility |
| src/libsync/vfs/suffix/CMakeLists.txt | Added BUILD_WITH_INSTALL_RPATH property to nextcloudsync_vfs_suffix plugin target to prevent install-time RPATH errors |
| shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj | Removed TARGETED_DEVICE_FAMILY setting from Debug and Release configurations (inappropriate for macOS-only targets) |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| # macdeployqt (POST_BUILD) replaces the build-tree RPATH with @loader_path/../Frameworks. | ||
| # Setting BUILD_WITH_INSTALL_RPATH prevents CMake from separately tracking the build-tree | ||
| # RPATH and then trying to delete it at cmake --install time (which would fail because | ||
| # macdeployqt has already removed it). | ||
| set_target_properties(nextcloud PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) |
There was a problem hiding this comment.
The PR title mentions "Remove TARGETED_DEVICE_FAMILY" but the primary changes in this pull request are adding BUILD_WITH_INSTALL_RPATH to fix RPATH handling with macdeployqt. The TARGETED_DEVICE_FAMILY removal is only a small part of the changes in the Xcode project file. Consider updating the PR title to better reflect the main purpose of these changes, such as "fix(macOS): Fix RPATH handling with macdeployqt" or including both changes in the title.
This unnecessary and unexpected build setting caused a compiler warning. Signed-off-by: Iva Horn <[email protected]>
7ae1cbd to
f854641
Compare
|
Artifact containing the AppImage: nextcloud-appimage-pr-9510.zip Digest: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
github-project-automation
Bot
moved this from 🏗️ In progress
to ☑️ Done
in 💻 Desktop Clients team
|
|
/backport to stable-33.0 |
No description provided.