build: SG-42130: XCode26 support#1091
build: SG-42130: XCode26 support#1091cedrik-fuoco-adsk merged 9 commits intoAcademySoftwareFoundation:mainfrom
Conversation
cedrik-fuoco-adsk
left a comment
There was a problem hiding this comment.
Thank you for fixing that! Did you encounter any other build issue or warning that came with using XCode 26?
There was a problem hiding this comment.
Pull request overview
Adds an automated workaround to build with Xcode 26+ on macOS by patching community Qt installs to avoid AGL, and updates docs/config accordingly.
Changes:
- Auto-detect Xcode 26+ in
rvcmds.shand run a Qt patching script. - Add
apply_qt_fix.shandqt_fix.patchto remove AGL references from Qt files. - Update macOS build documentation and tweak Python CMake target properties.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 8 comments.
Show a summary per file
| File | Description |
|---|---|
| rvcmds.sh | Detects Xcode 26+ on macOS and invokes Qt patch application automatically. |
| apply_qt_fix.sh | New script to apply an AGL-removal patch to specific Qt versions. |
| qt_fix.patch | Patch content that removes AGL framework/header usage from Qt config files. |
| docs/build_system/config_macos.md | Documents the new Xcode 26+ Qt patch requirement and how it’s applied. |
| cmake/dependencies/python3.cmake | Alters properties of the imported Python::Python target (potentially to affect system include handling). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
LGTM
Thank you @mcoliver for this great contribution !
|
I updated your branch to main to test it locally on my MacBook, but there are some issues with pre-commit again. |
|
Hi @mcoliver, we would be ready to merge the PR. Do you have time to fix the various issues? |
Hi @cedrik-fuoco-adsk Accepted some of the suggestions and ran |
Signed-off-by: Michael Oliver <mcoliver@gmail.com>
XCode26 was refusing to build Qt 6.5.3 and 6.8.3 because it lacks AGL. AGL is no longer used and newer versions of Qt have patched. This is a backport to patch 6.5.3 and 6.8.3. For reference: https://qt-project.atlassian.net/browse/QTBUG-137687 qt/qtbase@cdb33c3 Homebrew/homebrew-core@9ef0937 Signed-off-by: Michael Oliver <mcoliver@gmail.com>
updated cmake/dependencies/python3.cmake to use the IMPORTED_NO_SYSTEM property for the Python::Python target. This ensures that the Python include paths are treated as regular include paths (-I) rather than system include paths (-isystem), which resolves search order issues on newer Xcode versions. Signed-off-by: Michael Oliver <mcoliver@gmail.com>
Signed-off-by: Michael Oliver <mcoliver@gmail.com>
cmake-format -i CMakeLists.txt cmake/**/*.cmake Signed-off-by: Michael Oliver <mcoliver@gmail.com>
See this link for more details https://cmake.org/cmake/help/v3.31/prop_tgt/IMPORTED_NO_SYSTEM.html Signed-off-by: Michael Oliver <mcoliver@gmail.com>
non code changes. Grammatical fixes to docs. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Michael Oliver <mcoliver@gmail.com>
Signed-off-by: Michael Oliver <mcoliver@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Michael Oliver <mcoliver@gmail.com>
|
Thank you @mcoliver ! I'll merge it |
946e73c
into
AcademySoftwareFoundation:main
### [ 1090: Build with Xcode26 ] ### Linked issues Fixes AcademySoftwareFoundation#1090 ### Summarize your change. Backported a patch to Qt 6.5.3 and 6.8.3 which are the community versions available and do not have the patch in commercial versions ### Describe the reason for the change. Want to build with Xcode26. Was annoying to constantly have to switch with xcode-select. Additionally xcode26 should bring some compiler optimizations that may improve performance. ### Describe what you have tested and on which operating system. macos26.2 with Xcode26.2. RV CY2025 --------- Signed-off-by: Michael Oliver <mcoliver@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
[ 1090: Build with Xcode26 ]
Linked issues
Fixes #1090
Summarize your change.
Backported a patch to Qt 6.5.3 and 6.8.3 which are the community versions available and do not have the patch in commercial versions
Describe the reason for the change.
Want to build with Xcode26. Was annoying to constantly have to switch with xcode-select. Additionally xcode26 should bring some compiler optimizations that may improve performance.
Describe what you have tested and on which operating system.
macos26.2 with Xcode26.2. RV CY2025