diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-17 14:17:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-17 14:17:15 (GMT) |
| commit | c648551bea65c6457f21b608f31c4ccd5b69a0fa (patch) | |
| tree | b572276e3413b0fc3cc93900d94fa60b82a93fea | |
| parent | 09fba6146fa726a83cbbccc3d5fb288f7f14f111 (diff) | |
| parent | 844050adaf4ff28356a14b34d3ec73f36e843339 (diff) | |
| download | CMake-c648551bea65c6457f21b608f31c4ccd5b69a0fa.zip CMake-c648551bea65c6457f21b608f31c4ccd5b69a0fa.tar.gz CMake-c648551bea65c6457f21b608f31c4ccd5b69a0fa.tar.bz2 | |
Merge branch 'FindOpenGL-libglvnd-subdir' into release-3.14
Merge-request: !3236
| -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() |