STYLE: don't test twice for APPLE

Alex
This commit is contained in:
Alexander Neundorf 2007-07-03 11:41:37 -04:00
parent 2497822fd6
commit d9ec3bbe43
1 changed files with 65 additions and 63 deletions

View File

@ -14,11 +14,6 @@
# On OSX default to using the framework version of opengl # On OSX default to using the framework version of opengl
# People will have to change the cache values of OPENGL_glu_LIBRARY # People will have to change the cache values of OPENGL_glu_LIBRARY
# and OPENGL_gl_LIBRARY to use OpenGL with X11 on OSX # and OPENGL_gl_LIBRARY to use OpenGL with X11 on OSX
IF (APPLE)
FIND_LIBRARY(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX")
FIND_LIBRARY(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX")
FIND_PATH(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX")
ENDIF (APPLE)
IF (WIN32) IF (WIN32)
IF (CYGWIN) IF (CYGWIN)
@ -52,72 +47,79 @@ IF (WIN32)
ENDIF (CYGWIN) ENDIF (CYGWIN)
ELSE (WIN32) ELSE (WIN32)
IF(NOT APPLE)
# The first line below is to make sure that the proper headers IF (APPLE)
# are used on a Linux machine with the NVidia drivers installed.
# They replace Mesa with NVidia's own library but normally do not
# install headers and that causes the linking to
# fail since the compiler finds the Mesa headers but NVidia's library.
# Make sure the NVIDIA directory comes BEFORE the others.
# - Atanas Georgiev <atanas@cs.columbia.edu>
FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h FIND_LIBRARY(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX")
/usr/share/doc/NVIDIA_GLX-1.0/include FIND_LIBRARY(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX")
/usr/include FIND_PATH(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX")
/usr/local/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include
/usr/X11R6/include
)
FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h ELSE(APPLE)
/usr/share/doc/NVIDIA_GLX-1.0/include
/usr/include
/usr/local/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include
/usr/X11R6/include
)
FIND_LIBRARY(OPENGL_gl_LIBRARY # The first line below is to make sure that the proper headers
NAMES GL MesaGL # are used on a Linux machine with the NVidia drivers installed.
PATHS /usr/lib # They replace Mesa with NVidia's own library but normally do not
/usr/local/lib # install headers and that causes the linking to
/opt/graphics/OpenGL/lib # fail since the compiler finds the Mesa headers but NVidia's library.
/usr/openwin/lib # Make sure the NVIDIA directory comes BEFORE the others.
/usr/X11R6/lib # - Atanas Georgiev <atanas@cs.columbia.edu>
/usr/shlib
)
# On Unix OpenGL most certainly always requires X11. FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h
# Feel free to tighten up these conditions if you don't /usr/share/doc/NVIDIA_GLX-1.0/include
# think this is always true. /usr/include
# It's not true on OSX. /usr/local/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include
/usr/X11R6/include
)
IF (OPENGL_gl_LIBRARY) FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
IF(NOT X11_FOUND) /usr/share/doc/NVIDIA_GLX-1.0/include
INCLUDE(FindX11) /usr/include
ENDIF(NOT X11_FOUND) /usr/local/include
IF (X11_FOUND) /usr/openwin/share/include
IF (NOT APPLE) /opt/graphics/OpenGL/include
SET (OPENGL_LIBRARIES ${X11_LIBRARIES}) /usr/X11R6/include
ENDIF (NOT APPLE) )
ENDIF (X11_FOUND)
ENDIF (OPENGL_gl_LIBRARY)
FIND_LIBRARY(OPENGL_glu_LIBRARY FIND_LIBRARY(OPENGL_gl_LIBRARY
NAMES GLU MesaGLU NAMES GL MesaGL
PATHS ${OPENGL_gl_LIBRARY} PATHS /usr/lib
/usr/lib /usr/local/lib
/usr/local/lib /opt/graphics/OpenGL/lib
/opt/graphics/OpenGL/lib /usr/openwin/lib
/usr/openwin/lib /usr/X11R6/lib
/usr/X11R6/lib /usr/shlib
/usr/shlib )
)
ENDIF(NOT APPLE) # On Unix OpenGL most certainly always requires X11.
# Feel free to tighten up these conditions if you don't
# think this is always true.
# It's not true on OSX.
IF (OPENGL_gl_LIBRARY)
IF(NOT X11_FOUND)
INCLUDE(FindX11)
ENDIF(NOT X11_FOUND)
IF (X11_FOUND)
IF (NOT APPLE)
SET (OPENGL_LIBRARIES ${X11_LIBRARIES})
ENDIF (NOT APPLE)
ENDIF (X11_FOUND)
ENDIF (OPENGL_gl_LIBRARY)
FIND_LIBRARY(OPENGL_glu_LIBRARY
NAMES GLU MesaGLU
PATHS ${OPENGL_gl_LIBRARY}
/usr/lib
/usr/local/lib
/opt/graphics/OpenGL/lib
/usr/openwin/lib
/usr/X11R6/lib
/usr/shlib
)
ENDIF(APPLE)
ENDIF (WIN32) ENDIF (WIN32)
SET( OPENGL_FOUND "NO" ) SET( OPENGL_FOUND "NO" )