diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-02 13:45:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-02 13:45:59 (GMT) |
| commit | b212fba208df4f7184efa63b6c037d998ab18cd5 (patch) | |
| tree | 0e1859e78ae16f715242d94b72efd467bf689ea1 | |
| parent | f95796642b1f2f5004f73be326b16538cec5b5a2 (diff) | |
| parent | fb4b2ed0d34f4b1240b5f69fb3a3e77efc191aa1 (diff) | |
| download | CMake-b212fba208df4f7184efa63b6c037d998ab18cd5.zip CMake-b212fba208df4f7184efa63b6c037d998ab18cd5.tar.gz CMake-b212fba208df4f7184efa63b6c037d998ab18cd5.tar.bz2 | |
Merge topic 'FindOpenGL-GLX-no-GLVND' into release-3.20
fb4b2ed0d3 FindOpenGL: handle GLX without GLVND
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5861
| -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 4766102..d6d1c00 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 |