[Cmake-commits] CMake branch, next, updated. v2.8.3-1043-g80976d6

[Ben Boeckel]

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  80976d630bc5bc977f0a2fc6805f7d56675e7882 (commit)
       via  937e3693d7cb71a83851ac7c74dd45028363aad0 (commit)
      from  2a0e6ce626e05b91c15d17e6aaf796fb4912dc26 (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=80976d630bc5bc977f0a2fc6805f7d56675e7882
commit 80976d630bc5bc977f0a2fc6805f7d56675e7882
Merge: 2a0e6ce 937e369
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Dec 21 10:43:47 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 21 10:43:47 2010 -0500

    Merge topic 'dev/use-fphsa-in-find-opengl' into next
    
    937e369 Use FPHSA in FindOpenGL


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=937e3693d7cb71a83851ac7c74dd45028363aad0
commit 937e3693d7cb71a83851ac7c74dd45028363aad0
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Dec 8 17:41:37 2010 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Dec 8 17:41:37 2010 -0500

    Use FPHSA in FindOpenGL
    
    This gets FindOpenGL to obey the QUIET and REQUIRED options correctly.

diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 21aafa9..3618963 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -123,7 +123,6 @@ ELSE (WIN32)
   ENDIF(APPLE)
 ENDIF (WIN32)
 
-SET( OPENGL_FOUND "NO" )
 IF(OPENGL_gl_LIBRARY)
 
     IF(OPENGL_xmesa_INCLUDE_DIR)
@@ -140,10 +139,7 @@ IF(OPENGL_gl_LIBRARY)
       SET( OPENGL_GLU_FOUND "NO" )
     ENDIF(OPENGL_glu_LIBRARY)
 
-    SET( OPENGL_FOUND "YES" )
-
     # This deprecated setting is for backward compatibility with CMake1.4
-
     SET (OPENGL_LIBRARY ${OPENGL_LIBRARIES})
 
 ENDIF(OPENGL_gl_LIBRARY)
@@ -151,6 +147,11 @@ ENDIF(OPENGL_gl_LIBRARY)
 # This deprecated setting is for backward compatibility with CMake1.4
 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(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY)
+
 MARK_AS_ADVANCED(
   OPENGL_INCLUDE_DIR
   OPENGL_xmesa_INCLUDE_DIR

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

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


hooks/post-receive
-- 
CMake