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

Merge topic 'FindOpenGL-clarify-libraries'

Browse Source 
f44fb2dd FindOpenGL: Clarify logic constructing OPENGL_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1459
This commit is contained in:
Brad King
2017-11-08 13:51:21 +00:00
committed by Kitware Robot
parent bd68d0c252 f44fb2dd4c
commit 7bd4c1c1bb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindOpenGL.cmake
+2 -1
View File
@@ -440,9 +440,10 @@ if(OPENGL_FOUND)
endif()
# OPENGL_LIBRARIES mirrors OpenGL::GL's logic ...
set(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY})
if(TARGET OpenGL::GLX AND TARGET OpenGL::OpenGL)
set(OPENGL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY})
else()
set(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY})
endif()
# ... and also includes GLU, if available.
if(TARGET OpenGL::GLU)