diff options
| author | Ian Scott <ian.m.scott@stud.man.ac.uk> | 2002-09-05 12:00:45 -0400 |
|---|---|---|
| committer | Ian Scott <ian.m.scott@stud.man.ac.uk> | 2002-09-05 12:00:45 -0400 |
| commit | 079e8469abd4a2b404fd460ff41012e8d8b6fd1d (patch) | |
| tree | a920d611d876599e8c04f4a301b5bcf927d6909b /Modules/FindGLUT.cmake | |
| parent | 12054916d491d8424b58a87c4ff69679a7f4476d (diff) | |
| download | cmake-079e8469abd4a2b404fd460ff41012e8d8b6fd1d.tar.gz | |
Hide lots of values in the advanced list
Fix some bugs
OpenGL always needs X11 on Unix
Diffstat (limited to 'Modules/FindGLUT.cmake')
| -rw-r--r-- | Modules/FindGLUT.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 2194347e33..68051fac66 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -19,7 +19,7 @@ IF (WIN32) ) FIND_LIBRARY( GLUT_glut_LIBRARY glut32 - ${OPENGL_LIBRARY_PATH} + ${OPENGL_LIBRARY_DIR} /usr/lib /usr/lib/w32api /usr/local/lib @@ -35,7 +35,7 @@ IF (WIN32) FIND_LIBRARY( GLUT_glut_LIBRARY glut ${GLUT_ROOT_PATH}/Release - ${OPENGL_LIBRARY_PATH} + ${OPENGL_LIBRARY_DIR} ) ENDIF(CYGWIN) @@ -45,7 +45,7 @@ ELSE (WIN32) IF (APPLE) # These values for Apple could probably do with improvement. FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h - ${OPENGL_LIBRARY_PATH} + ${OPENGL_LIBRARY_DIR} ) SET(GLUT_glut_LIBRARY "-framework Glut" CACHE STRING "GLUT library for OSX") ELSE (APPLE) @@ -107,5 +107,8 @@ IF(GLUT_INCLUDE_DIR) ENDIF(GLUT_INCLUDE_DIR) MARK_AS_ADVANCED( - GLUT_INCLUDE_PATH + GLUT_INCLUDE_DIR + GLUT_glut_LIBRARY + GLUT_Xmu_LIBRARY + GLUT_Xi_LIBRARY )
\ No newline at end of file |