diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-02 13:45:37 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-02 08:45:59 -0500 |
| commit | 579c383336f46d65e720418a95fec17f42d4ac69 (patch) | |
| tree | a5295aac05d21bc72c4add7e78b5661f670b8375 /Modules | |
| parent | 19cbee6730ca938aeba195dcd480fde207464204 (diff) | |
| parent | fb4b2ed0d34f4b1240b5f69fb3a3e77efc191aa1 (diff) | |
| download | cmake-579c383336f46d65e720418a95fec17f42d4ac69.tar.gz | |
Merge topic 'FindOpenGL-GLX-no-GLVND'
fb4b2ed0d3 FindOpenGL: handle GLX without GLVND
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5861
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenGL.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 4766102082..d6d1c0000c 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -465,7 +465,7 @@ if(OPENGL_FOUND) # ::GLX is a GLVND library, and thus Linux-only: we don't bother checking # for a framework version of this library. - if(OpenGL_GLX_FOUND AND NOT TARGET OpenGL::GLX) + if(OpenGL_GLX_FOUND AND NOT TARGET OpenGL::GLX AND TARGET OpenGL::OpenGL) if(IS_ABSOLUTE "${OPENGL_glx_LIBRARY}") add_library(OpenGL::GLX UNKNOWN IMPORTED) set_target_properties(OpenGL::GLX PROPERTIES IMPORTED_LOCATION |