This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, master has been updated via 87609eebf390bdf183aab80061ee9fa2fbdbc17a (commit) via 844050adaf4ff28356a14b34d3ec73f36e843339 (commit) from 8d5eb9787885d21d5d20630473c11a79250ca28e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87609eebf390bdf183aab80061ee9fa2fbdbc17a commit 87609eebf390bdf183aab80061ee9fa2fbdbc17a Merge: 8d5eb97 844050a Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Apr 17 14:43:23 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Apr 17 10:44:05 2019 -0400 Merge topic 'libglvnd-subdir' 844050adaf FindOpenGL: look for GLVND libraries with a libglvnd suffix Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3236 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=844050adaf4ff28356a14b34d3ec73f36e843339 commit 844050adaf4ff28356a14b34d3ec73f36e843339 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Mon Apr 15 15:37:59 2019 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Apr 17 10:16:46 2019 -0400 FindOpenGL: look for GLVND libraries with a libglvnd suffix On CentOS 6.10, the libglvnd package from EPEL installs its libraries under a libglvnd subdirectory. 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() ----------------------------------------------------------------------- Summary of changes: Modules/FindOpenGL.cmake | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits