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

FIX: GLU and GLUT flags for Mac OSX

Browse Source
This commit is contained in:
Sebastien Barre 2002-06-17 13:07:32 -04:00
parent 64a1707aee
commit 5458a0b50a
2 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Modules/FindGLU.cmake
View File

@ -12,27 +12,36 @@ 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 IF (APPLE)
${OPENGL_INCLUDE_PATH} # The GLU lib is included in the OpenGL framework. We can not
/usr/include # set GLU_LIBRARY to an empty string since it is equal to FALSE if
/usr/local/include # this variable is used in a IF test. So let's set it to the OpenGL
/usr/openwin/share/include # framework. It does not harm to duplicate the OpenGL framework and it
/opt/graphics/OpenGL/include # might even help in case OPENGL_LIBRARY is not set.
/usr/X11R6/include SET(GLU_LIBRARY "-framework Carbon -framework AGL -framework OpenGL" CACHE STRING "GLU library for OSX")
) ELSE (APPLE)
MARK_AS_ADVANCED( FIND_PATH(GLU_INCLUDE_PATH GL/glu.h
GLU_INCLUDE_PATH ${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 FIND_LIBRARY(GLU_LIBRARY GLU
${OPENGL_LIBRARY_PATH} ${OPENGL_LIBRARY_PATH}
/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
) )
ENDIF (APPLE)
ENDIF (WIN32) ENDIF (WIN32)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(

44
Modules/FindGLUT.cmake
View File

@ -20,28 +20,32 @@ IF (WIN32)
) )
ENDIF (CYGWIN) ENDIF (CYGWIN)
ELSE (WIN32) ELSE (WIN32)
FIND_PATH(GLUT_INCLUDE_PATH GL/glut.h IF (APPLE)
${OPENGL_INCLUDE_PATH} SET(GLUT_LIBRARY "-framework Glut" CACHE STRING "GLUT library for OSX")
/usr/include ELSE (APPLE)
/usr/include/GL FIND_PATH(GLUT_INCLUDE_PATH GL/glut.h
/usr/local/include ${OPENGL_INCLUDE_PATH}
/usr/openwin/share/include /usr/include
/opt/graphics/OpenGL/include /usr/include/GL
/usr/X11R6/include /usr/local/include
) /usr/openwin/share/include
MARK_AS_ADVANCED( /opt/graphics/OpenGL/include
GLUT_INCLUDE_PATH /usr/X11R6/include
) )
MARK_AS_ADVANCED(
GLUT_INCLUDE_PATH
)
FIND_LIBRARY(GLUT_LIBRARY glut FIND_LIBRARY(GLUT_LIBRARY glut
${OPENGL_LIBRARY_PATH} ${OPENGL_LIBRARY_PATH}
/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
) )
ENDIF (APPLE)
ENDIF (WIN32) ENDIF (WIN32)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(