BUG: fix bug 6594 look for glut in more places on windows
This commit is contained in:
parent
cddb1346b7
commit
0deb9012a6
@ -8,29 +8,12 @@
|
|||||||
# GLUT_Xi_LIBRARY = the full path to the Xi Library.
|
# GLUT_Xi_LIBRARY = the full path to the Xi Library.
|
||||||
|
|
||||||
IF (WIN32)
|
IF (WIN32)
|
||||||
|
FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h
|
||||||
IF(CYGWIN)
|
PATHS ${GLUT_ROOT_PATH}/include )
|
||||||
|
FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32
|
||||||
FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h )
|
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_glut_LIBRARY glut32
|
|
||||||
${OPENGL_LIBRARY_DIR}
|
${OPENGL_LIBRARY_DIR}
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
ELSE(CYGWIN)
|
|
||||||
|
|
||||||
FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
|
|
||||||
${GLUT_ROOT_PATH}/include
|
|
||||||
)
|
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_glut_LIBRARY glut
|
|
||||||
${GLUT_ROOT_PATH}/Release
|
${GLUT_ROOT_PATH}/Release
|
||||||
${OPENGL_LIBRARY_DIR}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
ENDIF(CYGWIN)
|
|
||||||
|
|
||||||
ELSE (WIN32)
|
ELSE (WIN32)
|
||||||
|
|
||||||
IF (APPLE)
|
IF (APPLE)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user