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 7bd4c1c1bbe94c85e4e361ffcafb3c0ec204d8a6 (commit)
via f44fb2dd4ce5e47cd0a12d1a25bda40f012d453a (commit)
from bd68d0c252f4ebf91d03837e8404b3cb8c4f7465 (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=7bd4c1c1bbe94c85e4e361ffcafb3c0ec204d8a6
commit 7bd4c1c1bbe94c85e4e361ffcafb3c0ec204d8a6
Merge: bd68d0c f44fb2d
Author: Brad King <[email protected]>
AuthorDate: Wed Nov 8 13:51:21 2017 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Wed Nov 8 08:52:01 2017 -0500
Merge topic 'FindOpenGL-clarify-libraries'
f44fb2dd FindOpenGL: Clarify logic constructing OPENGL_LIBRARIES
Acked-by: Kitware Robot <[email protected]>
Merge-request: !1459
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f44fb2dd4ce5e47cd0a12d1a25bda40f012d453a
commit f44fb2dd4ce5e47cd0a12d1a25bda40f012d453a
Author: Brad King <[email protected]>
AuthorDate: Tue Nov 7 07:57:09 2017 -0500
Commit: Brad King <[email protected]>
CommitDate: Tue Nov 7 09:33:43 2017 -0500
FindOpenGL: Clarify logic constructing OPENGL_LIBRARIES
Our comment says the logic matches that for OpenGL::GL. Structure
the logic the same way to make this clearer.
Issue: #17437
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 59bee41..8cceabd 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -440,9 +440,10 @@ if(OPENGL_FOUND)
endif()
# OPENGL_LIBRARIES mirrors OpenGL::GL's logic ...
- set(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY})
if(TARGET OpenGL::GLX AND TARGET OpenGL::OpenGL)
set(OPENGL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY})
+ else()
+ set(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY})
endif()
# ... and also includes GLU, if available.
if(TARGET OpenGL::GLU)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenGL.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
