more GLUT module cleanup

This commit is contained in:
Stephen Birarda 2014-03-07 11:33:47 -08:00
parent 45ff1e4055
commit 42addd4ed4

View file

@ -10,74 +10,74 @@
# Adapted from FindGLUT.cmake available in tlorach's OpenGLText Repository # Adapted from FindGLUT.cmake available in tlorach's OpenGLText Repository
# https://raw.github.com/tlorach/OpenGLText/master/cmake/FindGLUT.cmake # https://raw.github.com/tlorach/OpenGLText/master/cmake/FindGLUT.cmake
if (WIN32) if (GLUT_INCLUDE_DIR AND GLUT_LIBRARIES)
find_path( GLUT_INCLUDE_DIR GL/glut.h set(GLUT_FOUND TRUE)
"${GLUT_ROOT_DIR}/include" elseif()
"$ENV{GLUT_ROOT_DIR}/include" if (WIN32)
"$ENV{HIFI_LIB_DIR}/freeglut/include" find_path( GLUT_INCLUDE_DIR GL/glut.h
"${OPENGL_INCLUDE_DIR}" "${GLUT_ROOT_DIR}/include"
DOC "The directory where GL/glut.h resides") "$ENV{GLUT_ROOT_DIR}/include"
if(ARCH STREQUAL "x86") "$ENV{HIFI_LIB_DIR}/freeglut/include"
find_library( GLUT_glut_LIBRARY "${OPENGL_INCLUDE_DIR}"
NAMES freeglut DOC "The directory where GL/glut.h resides")
PATHS if(ARCH STREQUAL "x86")
"${GLUT_ROOT_DIR}/lib" find_library( GLUT_glut_LIBRARY
"$ENV{GLUT_ROOT_DIR}/lib" NAMES freeglut
"$ENV{HIFI_LIB_DIR}/freeglut/lib" PATHS
DOC "The GLUT library") "${GLUT_ROOT_DIR}/lib"
else() "$ENV{GLUT_ROOT_DIR}/lib"
find_library( GLUT_glut_LIBRARY "$ENV{HIFI_LIB_DIR}/freeglut/lib"
NAMES freeglut DOC "The GLUT library")
PATHS else()
"${GLUT_ROOT_DIR}/lib/x64" find_library( GLUT_glut_LIBRARY
"$ENV{GLUT_ROOT_DIR}/lib/x64" NAMES freeglut
"$ENV{HIFI_LIB_DIR}/freeglut/lib/x64" PATHS
DOC "The GLUT library") "${GLUT_ROOT_DIR}/lib/x64"
endif() "$ENV{GLUT_ROOT_DIR}/lib/x64"
else () "$ENV{HIFI_LIB_DIR}/freeglut/lib/x64"
find_path( GLUT_INCLUDE_DIR GL/glut.h DOC "The GLUT library")
"${GLUT_LOCATION}/include" endif()
"$ENV{GLUT_LOCATION}/include" else ()
/usr/include find_path( GLUT_INCLUDE_DIR GL/glut.h
/usr/include/GL "${GLUT_LOCATION}/include"
/usr/local/include "$ENV{GLUT_LOCATION}/include"
/usr/openwin/share/include /usr/include
/usr/openwin/include /usr/include/GL
/usr/X11R6/include /usr/local/include
/usr/include/X11 /usr/openwin/share/include
/opt/graphics/OpenGL/include /usr/openwin/include
/opt/graphics/OpenGL/contrib/libglut /usr/X11R6/include
) /usr/include/X11
find_library( GLUT_glut_LIBRARY glut /opt/graphics/OpenGL/include
"${GLUT_LOCATION}/lib" /opt/graphics/OpenGL/contrib/libglut
"$ENV{GLUT_LOCATION}/lib" )
/usr/lib find_library( GLUT_glut_LIBRARY glut
/usr/local/lib "${GLUT_LOCATION}/lib"
/usr/openwin/lib "$ENV{GLUT_LOCATION}/lib"
/usr/X11R6/lib /usr/lib
) /usr/local/lib
find_library( GLUT_Xi_LIBRARY Xi /usr/openwin/lib
"${GLUT_LOCATION}/lib" /usr/X11R6/lib
"$ENV{GLUT_LOCATION}/lib" )
/usr/lib find_library( GLUT_Xi_LIBRARY Xi
/usr/local/lib "${GLUT_LOCATION}/lib"
/usr/openwin/lib "$ENV{GLUT_LOCATION}/lib"
/usr/X11R6/lib /usr/lib
) /usr/local/lib
find_library( GLUT_Xmu_LIBRARY Xmu /usr/openwin/lib
"${GLUT_LOCATION}/lib" /usr/X11R6/lib
"$ENV{GLUT_LOCATION}/lib" )
/usr/lib find_library( GLUT_Xmu_LIBRARY Xmu
/usr/local/lib "${GLUT_LOCATION}/lib"
/usr/openwin/lib "$ENV{GLUT_LOCATION}/lib"
/usr/X11R6/lib /usr/lib
) /usr/local/lib
endif (WIN32) /usr/openwin/lib
/usr/X11R6/lib
)
endif ()
set(GLUT_FOUND "NO") if(GLUT_INCLUDE_DIR AND GLUT_glut_LIBRARY)
if(GLUT_INCLUDE_DIR)
if(GLUT_glut_LIBRARY)
# Is -lXi and -lXmu required on all platforms that have it? # Is -lXi and -lXmu required on all platforms that have it?
# If not, we need some way to figure out what platform we are on. # If not, we need some way to figure out what platform we are on.
set(GLUT_LIBRARIES set(GLUT_LIBRARIES
@ -85,24 +85,16 @@ if(GLUT_INCLUDE_DIR)
${GLUT_Xmu_LIBRARY} ${GLUT_Xmu_LIBRARY}
${GLUT_Xi_LIBRARY} ${GLUT_Xi_LIBRARY}
) )
set( GLUT_FOUND "YES") set(GLUT_FOUND TRUE)
set (GLUT_LIBRARY ${GLUT_LIBRARIES}) set(GLUT_LIBRARY ${GLUT_LIBRARIES})
set (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR}) set(GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
endif ()
endif(GLUT_glut_LIBRARY) include(FindPackageHandleStandardArgs)
endif(GLUT_INCLUDE_DIR)
include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GLUT DEFAULT_MSG GLUT_INCLUDE_DIR GLUT_LIBRARIES)
find_package_handle_standard_args(GLUT DEFAULT_MSG mark_as_advanced(GLUT_INCLUDE_DIR GLUT_glut_LIBRARY GLUT_Xmu_LIBRARY GLUT_Xi_LIBRARY)
GLUT_INCLUDE_DIR
GLUT_LIBRARIES
)
mark_as_advanced( endif ()
GLUT_INCLUDE_DIR
GLUT_glut_LIBRARY
GLUT_Xmu_LIBRARY
GLUT_Xi_LIBRARY
)