mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-24 09:09:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindOpenGL-macOS-x11'

Browse Source 
1dbfe638da FindOpenGL: Document how to use macOS X11 OpenGL
a13f62427b FindOpenGL: Clarify cache entry doc strings on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9062
This commit is contained in:
Brad King
2023-12-12 13:43:13 +00:00
committed by Kitware Robot
parent 9642647646 1dbfe638da
commit 84a3e839ec
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindOpenGL.cmake
+26 -8
View File
@@ -177,9 +177,24 @@ GLVND. For non-GLVND Linux and other systems these are left undefined.
macOS-Specific
^^^^^^^^^^^^^^
On OSX FindOpenGL defaults to using the framework version of OpenGL. People
will have to change the cache values of OPENGL_glu_LIBRARY and
OPENGL_gl_LIBRARY to use OpenGL with X11 on OSX.
On macOS this module defaults to using the macOS-native framework
version of OpenGL. To use the X11 version of OpenGL on macOS, one
can disable searching of frameworks. For example:
.. code-block:: cmake
find_package(X11)
if(APPLE AND X11_FOUND)
set(CMAKE_FIND_FRAMEWORK NEVER)
find_package(OpenGL)
unset(CMAKE_FIND_FRAMEWORK)
else()
find_package(OpenGL)
endif()
An end user building this project may need to point CMake at their
X11 installation, e.g., with ``-DOpenGL_ROOT=/opt/X11``.
#]=======================================================================]
set(_OpenGL_REQUIRED_VARS OPENGL_gl_LIBRARY)
@@ -207,11 +222,14 @@ if (WIN32)
OPENGL_glu_LIBRARY
)
elseif (APPLE)
# The OpenGL.framework provides both gl and glu
find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL library for OS X")
find_library(OPENGL_glu_LIBRARY OpenGL DOC
"GLU library for OS X (usually same as OpenGL library)")
find_path(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OS X")
# The OpenGL.framework provides both gl and glu in OpenGL
# XQuartz provides libgl and libglu
find_library(OPENGL_gl_LIBRARY NAMES OpenGL GL DOC
"OpenGL GL library")
find_library(OPENGL_glu_LIBRARY NAMES OpenGL GLU DOC
"OpenGL GLU library")
find_path(OPENGL_INCLUDE_DIR NAMES OpenGL/gl.h GL/gl.h DOC
"Include for OpenGL")
list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR)
list(APPEND _OpenGL_CACHE_VARS