mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-15 14:00:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

FindOpenGL: Re-order component library searches

Browse Source 
Move the search for the legacy GL library to after the GLVND libraries.
For now we still always look for both.
This commit is contained in:
Brad King
2017-11-14 10:45:23 -05:00
parent 78f5d571e4
commit aadc38c7fd
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Modules/FindOpenGL.cmake
View File

@@ -179,13 +179,6 @@ else()
/opt/graphics/OpenGL/include /usr/X11R6/include /opt/graphics/OpenGL/include /usr/X11R6/include
) )
find_library(OPENGL_gl_LIBRARY
NAMES GL MesaGL
PATHS /opt/graphics/OpenGL/lib
/usr/openwin/lib
/usr/shlib /usr/X11R6/lib
${_OPENGL_LIB_PATH}
)
# Search for the GLVND libraries. We do this regardless of COMPONENTS; we'll # Search for the GLVND libraries. We do this regardless of COMPONENTS; we'll
# take into account the COMPONENTS logic later. # take into account the COMPONENTS logic later.
find_library(OPENGL_opengl_LIBRARY find_library(OPENGL_opengl_LIBRARY
@@ -213,6 +206,14 @@ else()
/usr/shlib /usr/X11R6/lib /usr/shlib /usr/X11R6/lib
) )
find_library(OPENGL_gl_LIBRARY
NAMES GL MesaGL
PATHS /opt/graphics/OpenGL/lib
/usr/openwin/lib
/usr/shlib /usr/X11R6/lib
${_OPENGL_LIB_PATH}
)
# FPHSA cannot handle "this OR that is required", so we conditionally set what # FPHSA cannot handle "this OR that is required", so we conditionally set what
# it must look for. First clear any previous config we might have done: # it must look for. First clear any previous config we might have done:
set(_OpenGL_REQUIRED_VARS) set(_OpenGL_REQUIRED_VARS)