diff options
| -rw-r--r-- | Modules/FindGLU.cmake | 27 | ||||
| -rw-r--r-- | Modules/FindGLUT.cmake | 13 |
2 files changed, 24 insertions, 16 deletions
diff --git a/Modules/FindGLU.cmake b/Modules/FindGLU.cmake index 25c6a57..7911c31 100644 --- a/Modules/FindGLU.cmake +++ b/Modules/FindGLU.cmake @@ -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_LIB_PATH = where the GLU library can be found # 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") ENDIF(BORLAND) ELSE (WIN32) - FIND_PATH(GLU_INCLUDE_PATH GL/glu.h - /usr/include - /usr/local/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include - /usr/X11R6/include + FIND_PATH(GLU_INCLUDE_PATH GL/glu.h + ${OPENGL_INCLUDE_PATH} + /usr/include + /usr/local/include + /usr/openwin/share/include + /opt/graphics/OpenGL/include + /usr/X11R6/include ) MARK_AS_ADVANCED( GLU_INCLUDE_PATH ) FIND_LIBRARY(GLU_LIBRARY GLU - /usr/lib - /usr/local/lib - /opt/graphics/OpenGL/lib - /usr/openwin/lib - /usr/X11R6/lib + ${OPENGL_LIBRARY_PATH} + /usr/lib + /usr/local/lib + /opt/graphics/OpenGL/lib + /usr/openwin/lib + /usr/X11R6/lib ) ENDIF (WIN32) diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index da9c0c1..658d90f 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -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_LIB_PATH = where the GLUT library can be found # GLUT_LIBRARY = the name of the GLUT library to link with # IF (WIN32) IF (CYGWIN) FIND_LIBRARY(GLUT_LIBRARY glut32 + ${OPENGL_LIBRARY_PATH} /usr/lib/w32api + /usr/lib + /usr/local/lib + /usr/X11R6/lib ) ELSE (CYGWIN) - FIND_LIBRARY(GLUT_LIBRARY glut32) + FIND_LIBRARY(GLUT_LIBRARY glut32 + ${OPENGL_LIBRARY_PATH} + ) ENDIF (CYGWIN) ELSE (WIN32) FIND_PATH(GLUT_INCLUDE_PATH GL/glut.h + ${OPENGL_INCLUDE_PATH} /usr/include /usr/include/GL /usr/local/include @@ -28,6 +34,7 @@ ELSE (WIN32) ) FIND_LIBRARY(GLUT_LIBRARY glut + ${OPENGL_LIBRARY_PATH} /usr/lib /usr/local/lib /opt/graphics/OpenGL/lib |