BUG: fix for bug 7104 look for GL in X11R6 dirs
This commit is contained in:
parent
1629963e7c
commit
2f20b9d33b
@ -57,20 +57,20 @@ ELSE (WIN32)
|
|||||||
FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h
|
FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h
|
||||||
/usr/share/doc/NVIDIA_GLX-1.0/include
|
/usr/share/doc/NVIDIA_GLX-1.0/include
|
||||||
/usr/openwin/share/include
|
/usr/openwin/share/include
|
||||||
/opt/graphics/OpenGL/include
|
/opt/graphics/OpenGL/include /usr/X11R6/include
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
|
FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
|
||||||
/usr/share/doc/NVIDIA_GLX-1.0/include
|
/usr/share/doc/NVIDIA_GLX-1.0/include
|
||||||
/usr/openwin/share/include
|
/usr/openwin/share/include
|
||||||
/opt/graphics/OpenGL/include
|
/opt/graphics/OpenGL/include /usr/X11R6/include
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(OPENGL_gl_LIBRARY
|
FIND_LIBRARY(OPENGL_gl_LIBRARY
|
||||||
NAMES GL MesaGL
|
NAMES GL MesaGL
|
||||||
PATHS /opt/graphics/OpenGL/lib
|
PATHS /opt/graphics/OpenGL/lib
|
||||||
/usr/openwin/lib
|
/usr/openwin/lib
|
||||||
/usr/shlib
|
/usr/shlib /usr/X11R6/lib
|
||||||
)
|
)
|
||||||
|
|
||||||
# On Unix OpenGL most certainly always requires X11.
|
# On Unix OpenGL most certainly always requires X11.
|
||||||
@ -94,7 +94,7 @@ ELSE (WIN32)
|
|||||||
PATHS ${OPENGL_gl_LIBRARY}
|
PATHS ${OPENGL_gl_LIBRARY}
|
||||||
/opt/graphics/OpenGL/lib
|
/opt/graphics/OpenGL/lib
|
||||||
/usr/openwin/lib
|
/usr/openwin/lib
|
||||||
/usr/shlib
|
/usr/shlib /usr/X11R6/lib
|
||||||
)
|
)
|
||||||
|
|
||||||
ENDIF(APPLE)
|
ENDIF(APPLE)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user