ENH: make all OpenGL libs advanced, and add support for glu lib with Borland
This commit is contained in:
parent
e57d209bdc
commit
5380afe02b
@ -7,7 +7,11 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
IF (WIN32)
|
IF (WIN32)
|
||||||
SET (GLU_LIBRARY glu32 CACHE STRING "GLU library for 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)
|
ELSE (WIN32)
|
||||||
FIND_PATH(GLU_INCLUDE_PATH GL/gl.h
|
FIND_PATH(GLU_INCLUDE_PATH GL/gl.h
|
||||||
/usr/include
|
/usr/include
|
||||||
@ -16,6 +20,9 @@ ELSE (WIN32)
|
|||||||
/opt/graphics/OpenGL/include
|
/opt/graphics/OpenGL/include
|
||||||
/usr/X11R6/include
|
/usr/X11R6/include
|
||||||
)
|
)
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
GLU_INCLUDE_PATH
|
||||||
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(GLU_LIBRARY GLU
|
FIND_LIBRARY(GLU_LIBRARY GLU
|
||||||
/usr/lib
|
/usr/lib
|
||||||
@ -26,3 +33,7 @@ ELSE (WIN32)
|
|||||||
)
|
)
|
||||||
|
|
||||||
ENDIF (WIN32)
|
ENDIF (WIN32)
|
||||||
|
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
GLU_LIBRARY
|
||||||
|
)
|
||||||
|
@ -18,6 +18,9 @@ ELSE (WIN32)
|
|||||||
/opt/graphics/OpenGL/include
|
/opt/graphics/OpenGL/include
|
||||||
/usr/X11R6/include
|
/usr/X11R6/include
|
||||||
)
|
)
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
GLUT_INCLUDE_PATH
|
||||||
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(GLUT_LIBRARY glut
|
FIND_LIBRARY(GLUT_LIBRARY glut
|
||||||
/usr/lib
|
/usr/lib
|
||||||
@ -28,3 +31,7 @@ ELSE (WIN32)
|
|||||||
)
|
)
|
||||||
|
|
||||||
ENDIF (WIN32)
|
ENDIF (WIN32)
|
||||||
|
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
GLUT_LIBRARY
|
||||||
|
)
|
||||||
|
@ -23,7 +23,10 @@ ELSE (WIN32)
|
|||||||
/opt/graphics/OpenGL/include
|
/opt/graphics/OpenGL/include
|
||||||
/usr/X11R6/include
|
/usr/X11R6/include
|
||||||
)
|
)
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
OPENGL_INCLUDE_PATH
|
||||||
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(OPENGL_LIBRARY GL
|
FIND_LIBRARY(OPENGL_LIBRARY GL
|
||||||
/usr/lib
|
/usr/lib
|
||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
@ -32,4 +35,8 @@ ELSE (WIN32)
|
|||||||
/usr/X11R6/lib
|
/usr/X11R6/lib
|
||||||
)
|
)
|
||||||
ENDIF (APPLE)
|
ENDIF (APPLE)
|
||||||
ENDIF (WIN32)
|
ENDIF (WIN32)
|
||||||
|
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
OPENGL_LIBRARY
|
||||||
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user