diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-08 13:51:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-08 13:52:01 (GMT) |
| commit | 7bd4c1c1bbe94c85e4e361ffcafb3c0ec204d8a6 (patch) | |
| tree | baa6ee9662a97357f73c91853881091b135173ca | |
| parent | bd68d0c252f4ebf91d03837e8404b3cb8c4f7465 (diff) | |
| parent | f44fb2dd4ce5e47cd0a12d1a25bda40f012d453a (diff) | |
| download | CMake-7bd4c1c1bbe94c85e4e361ffcafb3c0ec204d8a6.zip CMake-7bd4c1c1bbe94c85e4e361ffcafb3c0ec204d8a6.tar.gz CMake-7bd4c1c1bbe94c85e4e361ffcafb3c0ec204d8a6.tar.bz2 | |
Merge topic 'FindOpenGL-clarify-libraries'
f44fb2dd FindOpenGL: Clarify logic constructing OPENGL_LIBRARIES
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1459
| -rw-r--r-- | Modules/FindOpenGL.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 59bee41..8cceabd 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -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) |