[Cmake-commits] [cmake-commits] hoffman committed FindGLUT.cmake 1.19 1.20

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv26638

Modified Files:
	FindGLUT.cmake 
Log Message:
BUG: fix bug 6594 look for glut in more places on windows


Index: FindGLUT.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGLUT.cmake,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** FindGLUT.cmake	19 Jul 2007 13:00:51 -0000	1.19
--- FindGLUT.cmake	13 Mar 2008 14:56:40 -0000	1.20
***************
*** 9,47 ****
  
  IF (WIN32)
! 
!   IF(CYGWIN)
! 
!     FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h )
! 
!     FIND_LIBRARY( GLUT_glut_LIBRARY glut32
!       ${OPENGL_LIBRARY_DIR}
!     )
! 
! 
!   ELSE(CYGWIN)
! 
!     FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
!       ${GLUT_ROOT_PATH}/include
!     )
! 
!     FIND_LIBRARY( GLUT_glut_LIBRARY glut
!       ${GLUT_ROOT_PATH}/Release
!       ${OPENGL_LIBRARY_DIR}
      )
- 
-   ENDIF(CYGWIN)
- 
  ELSE (WIN32)
! 
    IF (APPLE)
! # These values for Apple could probably do with improvement.
      FIND_PATH( GLUT_INCLUDE_DIR glut.h
        /System/Library/Frameworks/GLUT.framework/Versions/A/Headers
        ${OPENGL_LIBRARY_DIR}
!     )
      SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX") 
      SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
    ELSE (APPLE)
! 
      FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
        /usr/include/GL
--- 9,30 ----
  
  IF (WIN32)
!   FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h 
!     PATHS  ${GLUT_ROOT_PATH}/include )
!   FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32
!     ${OPENGL_LIBRARY_DIR}
!     ${GLUT_ROOT_PATH}/Release
      )
  ELSE (WIN32)
!   
    IF (APPLE)
!     # These values for Apple could probably do with improvement.
      FIND_PATH( GLUT_INCLUDE_DIR glut.h
        /System/Library/Frameworks/GLUT.framework/Versions/A/Headers
        ${OPENGL_LIBRARY_DIR}
!       )
      SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX") 
      SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
    ELSE (APPLE)
!     
      FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
        /usr/include/GL
***************
*** 50,69 ****
        /opt/graphics/OpenGL/include
        /opt/graphics/OpenGL/contrib/libglut
!     )
! 
      FIND_LIBRARY( GLUT_glut_LIBRARY glut
        /usr/openwin/lib
!     )
! 
      FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
        /usr/openwin/lib
!     )
! 
      FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
        /usr/openwin/lib
!     )
! 
    ENDIF (APPLE)
! 
  ENDIF (WIN32)
  
--- 33,52 ----
        /opt/graphics/OpenGL/include
        /opt/graphics/OpenGL/contrib/libglut
!       )
!   
      FIND_LIBRARY( GLUT_glut_LIBRARY glut
        /usr/openwin/lib
!       )
!     
      FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
        /usr/openwin/lib
!       )
!     
      FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
        /usr/openwin/lib
!       )
!     
    ENDIF (APPLE)
!   
  ENDIF (WIN32)
  
***************
*** 78,88 ****
        ${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})
! 
    ENDIF(GLUT_glut_LIBRARY)
  ENDIF(GLUT_INCLUDE_DIR)
--- 61,71 ----
        ${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})
!     
    ENDIF(GLUT_glut_LIBRARY)
  ENDIF(GLUT_INCLUDE_DIR)
***************
*** 93,95 ****
    GLUT_Xmu_LIBRARY
    GLUT_Xi_LIBRARY
! )
--- 76,78 ----
    GLUT_Xmu_LIBRARY
    GLUT_Xi_LIBRARY
!   )