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

FIX: typo + bring back the OPENGL_gl_LIBRARY path that can be used to find GLU (was wiped out from FindGLU)

Browse Source
This commit is contained in:
Sebastien Barre 2002-09-10 13:32:45 -04:00
parent 3c3ea267b8
commit 15d27bbc42
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/FindOpenGL.cmake
View File

@ -10,7 +10,7 @@
# #
# Also defined, but not for general use are # Also defined, but not for general use are
# OPENGL_gl_LIBRARY - Path to OpenGL Library # OPENGL_gl_LIBRARY - Path to OpenGL Library
# OPENGL_glu_LIBRARY - Pat to GLU Librar # OPENGL_glu_LIBRARY - Path to GLU Library
# #
IF (WIN32) IF (WIN32)
@ -91,7 +91,9 @@ ELSE (WIN32)
) )
# On Unix OpenGL most certainly always requires X11. # On Unix OpenGL most certainly always requires X11.
# Feel free to tighten up these conditions if you don't think this is always true. # Feel free to tighten up these conditions if you don't
# think this is always true.
IF (OPENGL_gl_LIBRARY) IF (OPENGL_gl_LIBRARY)
INCLUDE( ${CMAKE_ROOT}/Modules/FindX11.cmake ) INCLUDE( ${CMAKE_ROOT}/Modules/FindX11.cmake )
IF (X11_FOUND) IF (X11_FOUND)
@ -101,7 +103,8 @@ ELSE (WIN32)
FIND_LIBRARY(OPENGL_glu_LIBRARY FIND_LIBRARY(OPENGL_glu_LIBRARY
NAMES MesaGLU GLU NAMES MesaGLU GLU
PATHS /usr/lib PATHS ${OPENGL_gl_LIBRARY}
/usr/lib
/usr/local/lib /usr/local/lib
/opt/graphics/OpenGL/lib /opt/graphics/OpenGL/lib
/usr/openwin/lib /usr/openwin/lib
@ -110,7 +113,6 @@ ELSE (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
SET( OPENGL_FOUND "NO" ) SET( OPENGL_FOUND "NO" )
IF(OPENGL_INCLUDE_DIR) IF(OPENGL_INCLUDE_DIR)
IF(OPENGL_gl_LIBRARY) IF(OPENGL_gl_LIBRARY)
@ -131,8 +133,9 @@ IF(OPENGL_INCLUDE_DIR)
SET( OPENGL_FOUND "YES" ) SET( OPENGL_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 (OPENGL_LIBRARY ${OPENGL_LIBRARIES}) SET (OPENGL_LIBRARY ${OPENGL_LIBRARIES})
SET (OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR}) SET (OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
@ -142,7 +145,9 @@ IF(OPENGL_INCLUDE_DIR)
ENDIF(OPENGL_INCLUDE_DIR) ENDIF(OPENGL_INCLUDE_DIR)
# On OSX, OpenGL is always there - this will need refining for those using OpenGL with X11 # On OSX, OpenGL is always there - this will need refining for those
# using OpenGL with X11
IF (APPLE) IF (APPLE)
SET (OPENGL_FOUND "YES") SET (OPENGL_FOUND "YES")
SET (OPENGL_GLU_FOUND "YES") SET (OPENGL_GLU_FOUND "YES")
@ -152,8 +157,6 @@ IF (APPLE)
SET (OPENGL_glu_LIBRARY "-framework AGL" CACHE STRING "AGL lib for OSX") SET (OPENGL_glu_LIBRARY "-framework AGL" CACHE STRING "AGL lib for OSX")
ENDIF (APPLE) ENDIF (APPLE)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
OPENGL_INCLUDE_DIR OPENGL_INCLUDE_DIR
OPENGL_xmesa_INCLUDE_DIR OPENGL_xmesa_INCLUDE_DIR