diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-17 14:43:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-17 14:44:05 (GMT) |
| commit | 87609eebf390bdf183aab80061ee9fa2fbdbc17a (patch) | |
| tree | cab9ffbcc948cbfddbb311ca592e4b0b0c054239 /Modules | |
| parent | 8d5eb9787885d21d5d20630473c11a79250ca28e (diff) | |
| parent | 844050adaf4ff28356a14b34d3ec73f36e843339 (diff) | |
| download | CMake-87609eebf390bdf183aab80061ee9fa2fbdbc17a.zip CMake-87609eebf390bdf183aab80061ee9fa2fbdbc17a.tar.gz CMake-87609eebf390bdf183aab80061ee9fa2fbdbc17a.tar.bz2 | |
Merge topic 'libglvnd-subdir'
844050adaf FindOpenGL: look for GLVND libraries with a libglvnd suffix
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3236
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenGL.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 832dca2..00db033 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -205,11 +205,13 @@ else() find_library(OPENGL_glx_LIBRARY NAMES GLX PATHS ${_OPENGL_LIB_PATH} + PATH_SUFFIXES libglvnd ) find_library(OPENGL_egl_LIBRARY NAMES EGL PATHS ${_OPENGL_LIB_PATH} + PATH_SUFFIXES libglvnd ) find_library(OPENGL_glu_LIBRARY @@ -264,6 +266,7 @@ else() /usr/openwin/lib /usr/shlib ${_OPENGL_LIB_PATH} + PATH_SUFFIXES libglvnd ) endif() |