Skip to content

Ignore XQuartz prefixes in find_package() on macOS #333

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
tedwaine merged 2 commits into from
Sep 15, 2026
+6 −0
Merged

Ignore XQuartz prefixes in find_package() on macOS #333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a766c48
Ignore XQuartz prefixes in find_package() on macOS
OlafRocket Sep 2, 2026
8312c40
Merge branch 'develop' into fix/macos-xquartz-opengl
tedwaine Sep 15, 2026
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
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ set(XSTUDIO_GLOBAL_NAME xStudio)

project(${XSTUDIO_GLOBAL_NAME} VERSION ${XSTUDIO_GLOBAL_VERSION} LANGUAGES CXX)

# XQuartz's Mesa libGL under /opt/X11 shadows OpenGL.framework, so keep it off the search path.
if(APPLE)
list(APPEND CMAKE_IGNORE_PREFIX_PATH /opt/X11 /usr/X11 /usr/X11R6)
list(REMOVE_DUPLICATES CMAKE_IGNORE_PREFIX_PATH)
endif()

# Work around Qt bug: FindWrapOpenGL.cmake links -framework AGL, which was
# removed from the macOS SDK in 10.14. Fixed upstream in Qt 6.9+ but not
# backported to 6.5/6.8 LTS (see https://codereview.qt-project.org/c/qt/qtbase/+/652022).
Expand Down
Loading