diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-07 14:35:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-11-07 14:35:04 (GMT) |
| commit | 575250b6c4223f1b99ddc5e483b6216b07bd796e (patch) | |
| tree | d417837ae89514c670b332f4ecc7b655107b413a /Modules | |
| parent | 9a0d3e2ed66b740c3be9b98d4462929aadf40341 (diff) | |
| parent | f44fb2dd4ce5e47cd0a12d1a25bda40f012d453a (diff) | |
| download | CMake-575250b6c4223f1b99ddc5e483b6216b07bd796e.zip CMake-575250b6c4223f1b99ddc5e483b6216b07bd796e.tar.gz CMake-575250b6c4223f1b99ddc5e483b6216b07bd796e.tar.bz2 | |
Merge branch 'FindOpenGL-clarify-libraries' into release-3.10
Merge-request: !1459
Diffstat (limited to 'Modules')
| -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) |