kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix bug 6594 look for glut in more places on windows

Browse Source
This commit is contained in:
Bill Hoffman 2008-03-13 10:56:40 -04:00
parent cddb1346b7
commit 0deb9012a6
1 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Modules/FindGLUT.cmake
View File

@ -8,33 +8,16 @@
# GLUT_Xi_LIBRARY = the full path to the Xi Library. # GLUT_Xi_LIBRARY = the full path to the Xi Library.
IF (WIN32) IF (WIN32)
FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h
IF(CYGWIN) PATHS ${GLUT_ROOT_PATH}/include )
FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32
FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h )
FIND_LIBRARY( GLUT_glut_LIBRARY glut32
${OPENGL_LIBRARY_DIR} ${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 ${GLUT_ROOT_PATH}/Release
${OPENGL_LIBRARY_DIR}
) )
ENDIF(CYGWIN)
ELSE (WIN32) ELSE (WIN32)
IF (APPLE) IF (APPLE)
# These values for Apple could probably do with improvement. # These values for Apple could probably do with improvement.
FIND_PATH( GLUT_INCLUDE_DIR glut.h FIND_PATH( GLUT_INCLUDE_DIR glut.h
/System/Library/Frameworks/GLUT.framework/Versions/A/Headers /System/Library/Frameworks/GLUT.framework/Versions/A/Headers
${OPENGL_LIBRARY_DIR} ${OPENGL_LIBRARY_DIR}
@ -80,7 +63,7 @@ IF(GLUT_INCLUDE_DIR)
) )
SET( GLUT_FOUND "YES" ) SET( GLUT_FOUND "YES" )
#The following deprecated settings are for backwards compatibility with CMake1.4 #The following deprecated settings are for backwards compatibility with CMake1.4
SET (GLUT_LIBRARY ${GLUT_LIBRARIES}) SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR}) SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
@ -92,4 +75,4 @@ MARK_AS_ADVANCED(
GLUT_glut_LIBRARY GLUT_glut_LIBRARY
GLUT_Xmu_LIBRARY GLUT_Xmu_LIBRARY
GLUT_Xi_LIBRARY GLUT_Xi_LIBRARY
) )