[Cmake-commits] CMake branch, next, updated. v2.8.3-1391-g5d36ab1

[David Cole]

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  5d36ab17c7604bc8936ec00b22c3ddd081b0d8d4 (commit)
       via  efd1d9c7994468b0d45a7752aa86d1e32c59a6cf (commit)
      from  9f8df0c0c2422732717af4ed0a326e8f744b269a (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=5d36ab17c7604bc8936ec00b22c3ddd081b0d8d4
commit 5d36ab17c7604bc8936ec00b22c3ddd081b0d8d4
Merge: 9f8df0c efd1d9c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jan 17 14:21:07 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 17 14:21:07 2011 -0500

    Merge topic 'fix-10031-add-freeglut' into next
    
    efd1d9c Add freeglut as library name (#10031)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efd1d9c7994468b0d45a7752aa86d1e32c59a6cf
commit efd1d9c7994468b0d45a7752aa86d1e32c59a6cf
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Jan 17 14:19:18 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Jan 17 14:19:18 2011 -0500

    Add freeglut as library name (#10031)
    
    Thanks to Thomas Sondergaard for the patch in the bug report.

diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
index 45df79e..af88997 100644
--- a/Modules/FindGLUT.cmake
+++ b/Modules/FindGLUT.cmake
@@ -23,7 +23,7 @@
 IF (WIN32)
   FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h 
     PATHS  ${GLUT_ROOT_PATH}/include )
-  FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32
+  FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32 freeglut
     PATHS
     ${OPENGL_LIBRARY_DIR}
     ${GLUT_ROOT_PATH}/Release

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

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


hooks/post-receive
-- 
CMake