BUG: fix bug 6594 look for glut in more places on windows
This commit is contained in:
parent
cddb1346b7
commit
0deb9012a6
@ -8,37 +8,20 @@
|
|||||||
# 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 )
|
${OPENGL_LIBRARY_DIR}
|
||||||
|
${GLUT_ROOT_PATH}/Release
|
||||||
FIND_LIBRARY( GLUT_glut_LIBRARY glut32
|
|
||||||
${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
|
|
||||||
${OPENGL_LIBRARY_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
ENDIF(CYGWIN)
|
|
||||||
|
|
||||||
ELSE (WIN32)
|
ELSE (WIN32)
|
||||||
|
|
||||||
IF (APPLE)
|
IF (APPLE)
|
||||||
# These values for Apple could probably do with improvement.
|
# These values for Apple could probably do with improvement.
|
||||||
FIND_PATH( GLUT_INCLUDE_DIR glut.h
|
FIND_PATH( GLUT_INCLUDE_DIR glut.h
|
||||||
/System/Library/Frameworks/GLUT.framework/Versions/A/Headers
|
/System/Library/Frameworks/GLUT.framework/Versions/A/Headers
|
||||||
${OPENGL_LIBRARY_DIR}
|
${OPENGL_LIBRARY_DIR}
|
||||||
)
|
)
|
||||||
SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX")
|
SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX")
|
||||||
SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
|
SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
|
||||||
ELSE (APPLE)
|
ELSE (APPLE)
|
||||||
@ -49,19 +32,19 @@ ELSE (WIN32)
|
|||||||
/usr/openwin/include
|
/usr/openwin/include
|
||||||
/opt/graphics/OpenGL/include
|
/opt/graphics/OpenGL/include
|
||||||
/opt/graphics/OpenGL/contrib/libglut
|
/opt/graphics/OpenGL/contrib/libglut
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_glut_LIBRARY glut
|
FIND_LIBRARY( GLUT_glut_LIBRARY glut
|
||||||
/usr/openwin/lib
|
/usr/openwin/lib
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
|
FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
|
||||||
/usr/openwin/lib
|
/usr/openwin/lib
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
|
FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
|
||||||
/usr/openwin/lib
|
/usr/openwin/lib
|
||||||
)
|
)
|
||||||
|
|
||||||
ENDIF (APPLE)
|
ENDIF (APPLE)
|
||||||
|
|
||||||
@ -77,10 +60,10 @@ IF(GLUT_INCLUDE_DIR)
|
|||||||
${GLUT_Xmu_LIBRARY}
|
${GLUT_Xmu_LIBRARY}
|
||||||
${GLUT_Xi_LIBRARY}
|
${GLUT_Xi_LIBRARY}
|
||||||
${GLUT_cocoa_LIBRARY}
|
${GLUT_cocoa_LIBRARY}
|
||||||
)
|
)
|
||||||
SET( GLUT_FOUND "YES" )
|
SET( GLUT_FOUND "YES" )
|
||||||
|
|
||||||
#The following deprecated settings are for backwards compatibility with CMake1.4
|
#The following deprecated settings are for backwards compatibility with CMake1.4
|
||||||
SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
|
SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
|
||||||
SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
|
SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
|
||||||
|
|
||||||
@ -92,4 +75,4 @@ MARK_AS_ADVANCED(
|
|||||||
GLUT_glut_LIBRARY
|
GLUT_glut_LIBRARY
|
||||||
GLUT_Xmu_LIBRARY
|
GLUT_Xmu_LIBRARY
|
||||||
GLUT_Xi_LIBRARY
|
GLUT_Xi_LIBRARY
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user