[Cmake-commits] CMake branch, next, updated. v2.8.7-2630-g733ac6b

Rolf Eike Beer eike at sf-mail.de
Wed Feb 15 15:55:41 EST 2012


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  733ac6bd2dc822daa6b6d58a789cbd081ef6a037 (commit)
       via  14dadbde809d5091de44ef880376f69f6be2e23e (commit)
      from  4daa71ed4ae3e8cf98b7e39281569fd30a6a7b95 (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=733ac6bd2dc822daa6b6d58a789cbd081ef6a037
commit 733ac6bd2dc822daa6b6d58a789cbd081ef6a037
Merge: 4daa71e 14dadbd
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 15 15:55:39 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 15 15:55:39 2012 -0500

    Merge topic 'improve-findglut' into next
    
    14dadbd FindGLUT: honor REQUIRED (#12466)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14dadbde809d5091de44ef880376f69f6be2e23e
commit 14dadbde809d5091de44ef880376f69f6be2e23e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 8 20:05:06 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Feb 15 21:54:51 2012 +0100

    FindGLUT: honor REQUIRED (#12466)

diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
index af88997..8205779 100644
--- a/Modules/FindGLUT.cmake
+++ b/Modules/FindGLUT.cmake
@@ -64,25 +64,23 @@ ELSE (WIN32)
   
 ENDIF (WIN32)
 
-SET( GLUT_FOUND "NO" )
-IF(GLUT_INCLUDE_DIR)
-  IF(GLUT_glut_LIBRARY)
-    # Is -lXi and -lXmu required on all platforms that have it?
-    # If not, we need some way to figure out what platform we are on.
-    SET( GLUT_LIBRARIES
-      ${GLUT_glut_LIBRARY}
-      ${GLUT_Xmu_LIBRARY}
-      ${GLUT_Xi_LIBRARY} 
-      ${GLUT_cocoa_LIBRARY}
-      )
-    SET( GLUT_FOUND "YES" )
-    
-    #The following deprecated settings are for backwards compatibility with CMake1.4
-    SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
-    SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_glut_LIBRARY GLUT_INCLUDE_DIR)
+
+IF (GLUT_FOUND)
+  # Is -lXi and -lXmu required on all platforms that have it?
+  # If not, we need some way to figure out what platform we are on.
+  SET( GLUT_LIBRARIES
+    ${GLUT_glut_LIBRARY}
+    ${GLUT_Xmu_LIBRARY}
+    ${GLUT_Xi_LIBRARY}
+    ${GLUT_cocoa_LIBRARY}
+    )
     
-  ENDIF(GLUT_glut_LIBRARY)
-ENDIF(GLUT_INCLUDE_DIR)
+  #The following deprecated settings are for backwards compatibility with CMake1.4
+  SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
+  SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
+ENDIF(GLUT_FOUND)
 
 MARK_AS_ADVANCED(
   GLUT_INCLUDE_DIR

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

Summary of changes:
 Modules/FindGLUT.cmake |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list