FIX: GLU and GLUT flags for Mac OSX
This commit is contained in:
parent
64a1707aee
commit
5458a0b50a
@ -12,6 +12,14 @@ IF (WIN32)
|
||||
SET (GLU_LIBRARY glu32 CACHE STRING "GLU library for win32")
|
||||
ENDIF(BORLAND)
|
||||
ELSE (WIN32)
|
||||
IF (APPLE)
|
||||
# The GLU lib is included in the OpenGL framework. We can not
|
||||
# set GLU_LIBRARY to an empty string since it is equal to FALSE if
|
||||
# this variable is used in a IF test. So let's set it to the OpenGL
|
||||
# framework. It does not harm to duplicate the OpenGL framework and it
|
||||
# might even help in case OPENGL_LIBRARY is not set.
|
||||
SET(GLU_LIBRARY "-framework Carbon -framework AGL -framework OpenGL" CACHE STRING "GLU library for OSX")
|
||||
ELSE (APPLE)
|
||||
FIND_PATH(GLU_INCLUDE_PATH GL/glu.h
|
||||
${OPENGL_INCLUDE_PATH}
|
||||
/usr/include
|
||||
@ -33,6 +41,7 @@ ELSE (WIN32)
|
||||
/usr/X11R6/lib
|
||||
)
|
||||
|
||||
ENDIF (APPLE)
|
||||
ENDIF (WIN32)
|
||||
|
||||
MARK_AS_ADVANCED(
|
||||
|
@ -20,6 +20,9 @@ IF (WIN32)
|
||||
)
|
||||
ENDIF (CYGWIN)
|
||||
ELSE (WIN32)
|
||||
IF (APPLE)
|
||||
SET(GLUT_LIBRARY "-framework Glut" CACHE STRING "GLUT library for OSX")
|
||||
ELSE (APPLE)
|
||||
FIND_PATH(GLUT_INCLUDE_PATH GL/glut.h
|
||||
${OPENGL_INCLUDE_PATH}
|
||||
/usr/include
|
||||
@ -42,6 +45,7 @@ ELSE (WIN32)
|
||||
/usr/X11R6/lib
|
||||
)
|
||||
|
||||
ENDIF (APPLE)
|
||||
ENDIF (WIN32)
|
||||
|
||||
MARK_AS_ADVANCED(
|
||||
|
Loading…
x
Reference in New Issue
Block a user