[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1095-g18a73fc

[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  18a73fce79476bdd5668c6917df358ef61853f7d (commit)
       via  69f962b1b2b853589e3920d9213817592233bc63 (commit)
      from  bcc2698674653f497dc99c5005882ea1674a085b (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=18a73fce79476bdd5668c6917df358ef61853f7d
commit 18a73fce79476bdd5668c6917df358ef61853f7d
Merge: bcc2698 69f962b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 27 11:13:23 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 27 11:13:23 2012 -0500

    Merge topic 'FindOpenGL-require-include' into next
    
    69f962b Revert "FindOpenGL: Require GL/gl.h to be found (#13746)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69f962b1b2b853589e3920d9213817592233bc63
commit 69f962b1b2b853589e3920d9213817592233bc63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 27 11:13:07 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 27 11:13:07 2012 -0500

    Revert "FindOpenGL: Require GL/gl.h to be found (#13746)"
    
    This reverts commit 4960e9183429ea9f8a426d3adbd75c7ecab49fb5.

diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 62cbcd9..4a393f2 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 OPENGL_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY)
 
 mark_as_advanced(
   OPENGL_INCLUDE_DIR

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

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


hooks/post-receive
-- 
CMake