diff options
author | Ian Scott <ian.m.scott@stud.man.ac.uk> | 2002-09-03 10:10:06 (GMT) |
---|---|---|
committer | Ian Scott <ian.m.scott@stud.man.ac.uk> | 2002-09-03 10:10:06 (GMT) |
commit | 0b288b612119c551faa78644e7a1a7f395a78c98 (patch) | |
tree | 35e1ac2d9a16b3cf917eee03ce9fc647472b18ce /Modules/FindGLU.cmake | |
parent | a89dbfc1b9be897a2c9f0216d160185669ec795e (diff) | |
download | CMake-0b288b612119c551faa78644e7a1a7f395a78c98.zip CMake-0b288b612119c551faa78644e7a1a7f395a78c98.tar.gz CMake-0b288b612119c551faa78644e7a1a7f395a78c98.tar.bz2 |
Fixed mistake in comments
Transferred OPENGL finding logic in from VXL
Added Some backwards compatibility with CMake1.4
Diffstat (limited to 'Modules/FindGLU.cmake')
-rw-r--r-- | Modules/FindGLU.cmake | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/Modules/FindGLU.cmake b/Modules/FindGLU.cmake index e752e1a..ffb3ba3 100644 --- a/Modules/FindGLU.cmake +++ b/Modules/FindGLU.cmake @@ -1,49 +1,13 @@ # -# Try to find GLU, once done this will define: +# Use of this file is deprecated, and is here for backwards compatibility with CMake 1.4 +# GLU library is now found by FindOpenGL.cmake # -# GLU_INCLUDE_PATH = where the GLU include directory can be found -# GLU_LIBRARY = the name of the GLU library to link with # -IF (WIN32) - IF(BORLAND) - SET (GLU_LIBRARY import32 CACHE STRING "GLU library for win32") - ELSE(BORLAND) - SET (GLU_LIBRARY glu32 CACHE STRING "GLU library for win32") - ENDIF(BORLAND) -ELSE (WIN32) - IF (APPLE) - # The GLU lib is included in the OpenGL framework. We can not - # set GLU_LIBRARY to an empty string since it is equal to FALSE if - # this variable is used in a IF test. So let's set it to the OpenGL - # framework. It does not harm to duplicate the OpenGL framework and it - # might even help in case OPENGL_LIBRARY is not set. - SET(GLU_LIBRARY "-framework AGL -framework OpenGL" CACHE STRING "GLU library for OSX") - ELSE (APPLE) - FIND_PATH(GLU_INCLUDE_PATH GL/glu.h - ${OPENGL_INCLUDE_PATH} - /usr/include - /usr/local/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include - /usr/X11R6/include - ) - MARK_AS_ADVANCED( - GLU_INCLUDE_PATH - ) +INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake) - FIND_LIBRARY(GLU_LIBRARY GLU - ${OPENGL_LIBRARY_PATH} - /usr/lib - /usr/local/lib - /opt/graphics/OpenGL/lib - /usr/openwin/lib - /usr/X11R6/lib - ) +IF (OPENGL_GLU_FOUND) + SET (GLU_LIBRARY ${OPENGL_LIBRARIES}) + SET (GLU_INCLUDE_PATH ${OPENGL_INCLUDE_DIR}) +ENDIF (OPENGL_GLU_FOUND) - ENDIF (APPLE) -ENDIF (WIN32) - -MARK_AS_ADVANCED( - GLU_LIBRARY -) |