build: SG-42130: XCode26 support by mcoliver · Pull Request #1091 · AcademySoftwareFoundation/OpenRV

mcoliver · 2026-01-28T00:53:10Z

[ 1090: Build with Xcode26 ]

Linked issues

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>

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>

cmake/dependencies/python3.cmake

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>

cedrik-fuoco-adsk

Thank you for fixing that! Did you encounter any other build issue or warning that came with using XCode 26?

Copilot

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.sh and run a Qt patching script.
Add apply_qt_fix.sh and qt_fix.patch to 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.

Copilot · 2026-02-17T17:07:05Z

rvcmds.sh

+  if [ -n "$XCODE_MAJOR_VERSION" ] && [ "$XCODE_MAJOR_VERSION" -ge 26 ]; then
+    QT_BASE_DIR=$(dirname $(dirname "$QT_HOME"))


QT_BASE_DIR=$(dirname $(dirname "$QT_HOME")) is vulnerable to word-splitting/globbing if QT_HOME contains spaces, and the -ge comparison will emit “integer expression expected” (and may misbehave) if xcodebuild returns a non-numeric token (e.g., beta/dev strings). Quote the nested dirname substitutions and validate the version is numeric (e.g., [[ ... =~ ^[0-9]+$ ]]) before doing -ge.

Suggested change

if [ -n "$XCODE_MAJOR_VERSION" ] && [ "$XCODE_MAJOR_VERSION" -ge 26 ]; then

QT_BASE_DIR=$(dirname $(dirname "$QT_HOME"))

if [[ -n "$XCODE_MAJOR_VERSION" && "$XCODE_MAJOR_VERSION" =~ ^[0-9]+$ && "$XCODE_MAJOR_VERSION" -ge 26 ]]; then

QT_BASE_DIR="$(dirname "$(dirname "$QT_HOME")")"

Copilot · 2026-02-17T17:07:06Z

docs/build_system/config_macos.md

-In the meantime, you can use Xcode 16.4 on the latest macOS Tahoe 26 to build Open RV.
+If you are using >= Xcode 26 you will need to patch Qt 6.5.3 and 6.8.3 to implement the fix for [QTBUG-137687](https://bugreports.qt.io/browse/QTBUG-137687).
+
+This patch is ran during the sourcing of rvcmds.sh.  You can also run it directly via `sh apply_qt_fix.sh` 


The docs recommend running sh apply_qt_fix.sh, but apply_qt_fix.sh uses Bash-only features (notably the QT_VERSIONS=("6.5.3" "6.8.3") array). Running with sh will fail on systems where sh is not Bash; update the command to bash apply_qt_fix.sh or ./apply_qt_fix.sh.

Suggested change

This patch is ran during the sourcing of rvcmds.sh. You can also run it directly via `sh apply_qt_fix.sh`

This patch is ran during the sourcing of rvcmds.sh. You can also run it directly via `bash apply_qt_fix.sh`

docs/build_system/config_macos.md

Copilot · 2026-02-17T17:07:06Z

apply_qt_fix.sh

+
+if [[ "$(uname)" != "Darwin" ]]; then
+    echo "Error: This script is only intended for macOS (Darwin)."
+    exit 0


The script prints an error but exits with status 0 on non-macOS, which makes failures look like success in CI/automation. Return a non-zero exit code (e.g., exit 1) or change the message to be non-error informational if you intend this to be a no-op.

Suggested change

exit 0

exit 1

@mcoliver Is it indented to return 0 here?

Copilot · 2026-02-17T17:07:07Z

apply_qt_fix.sh

+        # Check if patch applies cleanly
+        if patch -p1 -d "$QT_DIR" --dry-run --batch < "$PATCH_FILE" >/dev/null 2>&1; then
+            echo "Applying patch to $version..."
+            patch -p1 -d "$QT_DIR" --batch < "$PATCH_FILE"
+            echo "Successfully patched $version."
+        else
+             echo "Error: Could not apply patch for version $version. It might be incompatible or already modified."
+             echo "Please check the files in $QT_DIR manually."
+             # Show dry run output for debugging
+             patch -p1 -d "$QT_DIR" --dry-run --batch < "$PATCH_FILE"
+        fi


If the patch cannot be applied, the script logs an error but continues and still ends with echo "Done.", producing a successful overall exit status. Consider tracking a failure flag and exiting non-zero at the end when any version fails to patch, so automated builds don’t silently proceed with an unpatched Qt.

Copilot · 2026-02-17T17:07:07Z

apply_qt_fix.sh

+
+        # Check if patch is already applied (by checking if AGL is still in FindWrapOpenGL.cmake)
+        if ! grep -q "AGL" "$QT_DIR/lib/cmake/Qt6/FindWrapOpenGL.cmake"; then
+             echo "Patch is already applied for version $version. Skipping."
+             continue
+        fi
+
+        # Check if patch applies cleanly
+        if patch -p1 -d "$QT_DIR" --dry-run --batch < "$PATCH_FILE" >/dev/null 2>&1; then
+            echo "Applying patch to $version..."
+            patch -p1 -d "$QT_DIR" --batch < "$PATCH_FILE"
+            echo "Successfully patched $version."
+        else
+             echo "Error: Could not apply patch for version $version. It might be incompatible or already modified."
+             echo "Please check the files in $QT_DIR manually."
+             # Show dry run output for debugging
+             patch -p1 -d "$QT_DIR" --dry-run --batch < "$PATCH_FILE"


The “already applied” detection is overly broad: grep -q "AGL" could match unrelated text and cause false positives/negatives across Qt point releases. Prefer checking for a more specific removed token (e.g., WrapOpenGL_AGL or -framework AGL) and/or validate both files touched by the patch (the CMake module and mkspecs/common/mac.conf) before declaring the patch applied.

Suggested change

# Check if patch is already applied (by checking if AGL is still in FindWrapOpenGL.cmake)

if ! grep -q "AGL" "$QT_DIR/lib/cmake/Qt6/FindWrapOpenGL.cmake"; then

echo "Patch is already applied for version $version. Skipping."

continue

fi

# Check if patch applies cleanly

if patch -p1 -d "$QT_DIR" --dry-run --batch < "$PATCH_FILE" >/dev/null 2>&1; then

echo "Applying patch to $version..."

patch -p1 -d "$QT_DIR" --batch < "$PATCH_FILE"

echo "Successfully patched $version."

else

echo "Error: Could not apply patch for version $version. It might be incompatible or already modified."

echo "Please check the files in $QT_DIR manually."

# Show dry run output for debugging

patch -p1 -d "$QT_DIR" --dry-run --batch < "$PATCH_FILE"

FIND_MODULE="$QT_DIR/lib/cmake/Qt6/FindWrapOpenGL.cmake"

MAC_CONF="$QT_DIR/mkspecs/common/mac.conf"

# Ensure expected Qt files exist before proceeding

if [ ! -f "$FIND_MODULE" ] || [ ! -f "$MAC_CONF" ]; then

echo "Warning: Required Qt files not found for version $version. Skipping."

continue

fi

# Check if patch is already applied:

# - WrapOpenGL_AGL removed from FindWrapOpenGL.cmake

# - -framework AGL removed from mkspecs/common/mac.conf

if ! grep -q "WrapOpenGL_AGL" "$FIND_MODULE" && \

! grep -q -- "-framework AGL" "$MAC_CONF"; then

echo "Patch is already applied for version $version. Skipping."

continue

fi

# Check if patch applies cleanly

if patch -p1 -d "$QT_DIR" --dry-run --batch < "$PATCH_FILE" >/dev/null 2>&1; then

echo "Applying patch to $version..."

patch -p1 -d "$QT_DIR" --batch < "$PATCH_FILE"

echo "Successfully patched $version."

else

echo "Error: Could not apply patch for version $version. It might be incompatible or already modified."

echo "Please check the files in $QT_DIR manually."

# Show dry run output for debugging

patch -p1 -d "$QT_DIR" --dry-run --batch < "$PATCH_FILE"

apply_qt_fix.sh

cmake/dependencies/python3.cmake

bernie-laberge

LGTM
Thank you @mcoliver for this great contribution !

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>

cedrik-fuoco-adsk · 2026-02-19T20:28:51Z

I updated your branch to main to test it locally on my MacBook, but there are some issues with pre-commit again.

cedrik-fuoco-adsk · 2026-02-25T16:50:27Z

Hi @mcoliver, we would be ready to merge the PR. Do you have time to fix the various issues?

mcoliver added 4 commits January 21, 2026 19:29

attempt at remove AGL so you can build with xcode26

aa30929

Signed-off-by: Michael Oliver <mcoliver@gmail.com>

update docs to reflect ability to compile with xcode26

1f62140

Signed-off-by: Michael Oliver <mcoliver@gmail.com>

mcoliver requested review from bernie-laberge, cedrik-fuoco-adsk and eloisebrosseau as code owners January 28, 2026 00:53

forgot to format

c4cd9b9

cmake-format -i CMakeLists.txt cmake/**/*.cmake Signed-off-by: Michael Oliver <mcoliver@gmail.com>

cedrik-fuoco-adsk reviewed Jan 28, 2026

View reviewed changes

cmake/dependencies/python3.cmake Show resolved Hide resolved

cedrik-fuoco-adsk added the do not merge Do not merge the PR label Jan 28, 2026

IMPORTED_NO_SYSTEM is deprecated. Moving to SYSTEM FALSE

aa73b11

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>

cedrik-fuoco-adsk removed the do not merge Do not merge the PR label Feb 12, 2026

cedrik-fuoco-adsk approved these changes Feb 12, 2026

View reviewed changes

eloisebrosseau requested a review from Copilot February 17, 2026 17:03

Copilot AI reviewed Feb 17, 2026

View reviewed changes

bernie-laberge added the community Contribution from the Open RV Community label Feb 17, 2026

bernie-laberge changed the title ~~Xcode26 support~~ SG-42130: Xcode26 support Feb 17, 2026

bernie-laberge approved these changes Feb 17, 2026

View reviewed changes

Apply suggestions from code review

1eb0e99

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>

cedrik-fuoco-adsk added tracked labels Feb 18, 2026

cedrik-fuoco-adsk changed the title ~~SG-42130: Xcode26 support~~ build: SG-42130: Xcode26 support Feb 19, 2026

Merge branch 'main' into xcode26

bd18c0f

cedrik-fuoco-adsk changed the title ~~build: SG-42130: Xcode26 support~~ build: SG-42130: XCode26 support Feb 19, 2026

		if [ -n "$XCODE_MAJOR_VERSION" ] && [ "$XCODE_MAJOR_VERSION" -ge 26 ]; then
		QT_BASE_DIR=$(dirname $(dirname "$QT_HOME"))

	This patch is ran during the sourcing of rvcmds.sh. You can also run it directly via `sh apply_qt_fix.sh`
	This patch is ran during the sourcing of rvcmds.sh. You can also run it directly via `bash apply_qt_fix.sh`

Conversation

mcoliver commented Jan 28, 2026

[ 1090: Build with Xcode26 ]

Linked issues

Summarize your change.

Describe the reason for the change.

Describe what you have tested and on which operating system.

Uh oh!

Uh oh!

cedrik-fuoco-adsk left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

cedrik-fuoco-adsk Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bernie-laberge left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cedrik-fuoco-adsk commented Feb 19, 2026

Uh oh!

cedrik-fuoco-adsk commented Feb 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bernie-laberge left a comment •

edited

Loading