[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1087-ga7423f9

[Brad King]

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, next has been updated
       via  a7423f9d55fb0f40318096d3b106d5bcad161115 (commit)
       via  4960e9183429ea9f8a426d3adbd75c7ecab49fb5 (commit)
      from  eb7dd113fdad7fe38a516f2c325718d320a8d3e2 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7423f9d55fb0f40318096d3b106d5bcad161115
commit a7423f9d55fb0f40318096d3b106d5bcad161115
Merge: eb7dd11 4960e91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 27 08:32:33 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 27 08:32:33 2012 -0500

    Merge topic 'FindOpenGL-require-include' into next
    
    4960e91 FindOpenGL: Require GL/gl.h to be found (#13746)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4960e9183429ea9f8a426d3adbd75c7ecab49fb5
commit 4960e9183429ea9f8a426d3adbd75c7ecab49fb5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 27 08:22:30 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 27 08:25:38 2012 -0500

    FindOpenGL: Require GL/gl.h to be found (#13746)
    
    Previously we required only OPENGL_gl_LIBRARY to set OpenGL_FOUND.
    Obviously projects need OPENGL_INCLUDE_DIR too in order to use the
    package.

diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 4a393f2..62cbcd9 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -150,7 +150,7 @@ set(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
 # handle the QUIETLY and REQUIRED arguments and set OPENGL_FOUND to TRUE if
 # all listed variables are TRUE
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY OPENGL_INCLUDE_DIR)
 
 mark_as_advanced(
   OPENGL_INCLUDE_DIR

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindOpenGL.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake