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

ENH: use OPENGL_LIBRARY_PATH as additional search path

Browse Source
This commit is contained in:
Sebastien Barre 2002-06-14 11:46:37 -04:00
parent 877610f2e9
commit ca07137305
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Modules/FindGLU.cmake
View File

@ -1,8 +1,7 @@
# #
# try to find GLU on UNIX systems once done this will define # Try to find GLU, once done this will define:
# #
# GLU_INCLUDE_PATH = where the GLU include directory can be found # GLU_INCLUDE_PATH = where the GLU include directory can be found
# GLU_LIB_PATH = where the GLU library can be found
# GLU_LIBRARY = the name of the GLU library to link with # GLU_LIBRARY = the name of the GLU library to link with
# #
@ -13,23 +12,25 @@ IF (WIN32)
SET (GLU_LIBRARY glu32 CACHE STRING "GLU library for win32") SET (GLU_LIBRARY glu32 CACHE STRING "GLU library for win32")
ENDIF(BORLAND) ENDIF(BORLAND)
ELSE (WIN32) ELSE (WIN32)
FIND_PATH(GLU_INCLUDE_PATH GL/glu.h FIND_PATH(GLU_INCLUDE_PATH GL/glu.h
/usr/include ${OPENGL_INCLUDE_PATH}
/usr/local/include /usr/include
/usr/openwin/share/include /usr/local/include
/opt/graphics/OpenGL/include /usr/openwin/share/include
/usr/X11R6/include /opt/graphics/OpenGL/include
/usr/X11R6/include
) )
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
GLU_INCLUDE_PATH GLU_INCLUDE_PATH
) )
FIND_LIBRARY(GLU_LIBRARY GLU FIND_LIBRARY(GLU_LIBRARY GLU
/usr/lib ${OPENGL_LIBRARY_PATH}
/usr/local/lib /usr/lib
/opt/graphics/OpenGL/lib /usr/local/lib
/usr/openwin/lib /opt/graphics/OpenGL/lib
/usr/X11R6/lib /usr/openwin/lib
/usr/X11R6/lib
) )
ENDIF (WIN32) ENDIF (WIN32)

13
Modules/FindGLUT.cmake
View File

@ -1,21 +1,27 @@
# #
# try to find GLU on UNIX systems once done this will define # Try to find GLUT, once done this will define:
# #
# GLUT_INCLUDE_PATH = where the GLUT include directory can be found # GLUT_INCLUDE_PATH = where the GLUT include directory can be found
# GLUT_LIB_PATH = where the GLUT library can be found
# GLUT_LIBRARY = the name of the GLUT library to link with # GLUT_LIBRARY = the name of the GLUT library to link with
# #
IF (WIN32) IF (WIN32)
IF (CYGWIN) IF (CYGWIN)
FIND_LIBRARY(GLUT_LIBRARY glut32 FIND_LIBRARY(GLUT_LIBRARY glut32
${OPENGL_LIBRARY_PATH}
/usr/lib/w32api /usr/lib/w32api
/usr/lib
/usr/local/lib
/usr/X11R6/lib
) )
ELSE (CYGWIN) ELSE (CYGWIN)
FIND_LIBRARY(GLUT_LIBRARY glut32) FIND_LIBRARY(GLUT_LIBRARY glut32
${OPENGL_LIBRARY_PATH}
)
ENDIF (CYGWIN) ENDIF (CYGWIN)
ELSE (WIN32) ELSE (WIN32)
FIND_PATH(GLUT_INCLUDE_PATH GL/glut.h FIND_PATH(GLUT_INCLUDE_PATH GL/glut.h
${OPENGL_INCLUDE_PATH}
/usr/include /usr/include
/usr/include/GL /usr/include/GL
/usr/local/include /usr/local/include
@ -28,6 +34,7 @@ ELSE (WIN32)
) )
FIND_LIBRARY(GLUT_LIBRARY glut FIND_LIBRARY(GLUT_LIBRARY glut
${OPENGL_LIBRARY_PATH}
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/opt/graphics/OpenGL/lib /opt/graphics/OpenGL/lib