Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:52:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

repair the glut find module to check include for header

Browse source
This commit is contained in:
Stephen Birarda 2014-03-07 10:45:18 -08:00
parent b56d995cf2
commit c3ebd83ae7
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cmake/modules/FindGLUT.cmake
View file

@ -12,32 +12,32 @@
if (WIN32) if (WIN32)
find_path( GLUT_INCLUDE_DIR GL/glut.h find_path( GLUT_INCLUDE_DIR GL/glut.h
${GLUT_ROOT_DIR}/include "${GLUT_ROOT_DIR}/include"
$ENV{GLUT_ROOT_DIR}/include "$ENV{GLUT_ROOT_DIR}/include"
$ENV{HIFI_LIB_DIR}/freeglut "$ENV{HIFI_LIB_DIR}/freeglut/include"
${OPENGL_INCLUDE_DIR} "${OPENGL_INCLUDE_DIR}"
DOC "The directory where GL/glut.h resides") DOC "The directory where GL/glut.h resides")
if(ARCH STREQUAL "x86") if(ARCH STREQUAL "x86")
find_library( GLUT_glut_LIBRARY find_library( GLUT_glut_LIBRARY
NAMES freeglut NAMES freeglut
PATHS PATHS
${GLUT_ROOT_DIR}/lib "${GLUT_ROOT_DIR}/lib"
$ENV{GLUT_ROOT_DIR}/lib "$ENV{GLUT_ROOT_DIR}/lib"
$ENV{HIFI_LIB_DIR}/freeglut/lib "$ENV{HIFI_LIB_DIR}/freeglut/lib"
DOC "The GLUT library") DOC "The GLUT library")
else() else()
find_library( GLUT_glut_LIBRARY find_library( GLUT_glut_LIBRARY
NAMES freeglut NAMES freeglut
PATHS PATHS
${GLUT_ROOT_DIR}/lib/x64 "${GLUT_ROOT_DIR}/lib/x64"
$ENV{GLUT_ROOT_DIR}/lib/x64 "$ENV{GLUT_ROOT_DIR}/lib/x64"
$ENV{HIFI_LIB_DIR}/freeglut/lib/x64 "$ENV{HIFI_LIB_DIR}/freeglut/lib/x64"
DOC "The GLUT library") DOC "The GLUT library")
endif() endif()
else () else ()
find_path( GLUT_INCLUDE_DIR GL/glut.h find_path( GLUT_INCLUDE_DIR GL/glut.h
${GLUT_LOCATION}/include "${GLUT_LOCATION}/include"
$ENV{GLUT_LOCATION}/include "$ENV{GLUT_LOCATION}/include"
/usr/include /usr/include
/usr/include/GL /usr/include/GL
/usr/local/include /usr/local/include
@ -49,24 +49,24 @@ else ()
/opt/graphics/OpenGL/contrib/libglut /opt/graphics/OpenGL/contrib/libglut
) )
find_library( GLUT_glut_LIBRARY glut find_library( GLUT_glut_LIBRARY glut
${GLUT_LOCATION}/lib "${GLUT_LOCATION}/lib"
$ENV{GLUT_LOCATION}/lib "$ENV{GLUT_LOCATION}/lib"
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/openwin/lib /usr/openwin/lib
/usr/X11R6/lib /usr/X11R6/lib
) )
find_library( GLUT_Xi_LIBRARY Xi find_library( GLUT_Xi_LIBRARY Xi
${GLUT_LOCATION}/lib "${GLUT_LOCATION}/lib"
$ENV{GLUT_LOCATION}/lib "$ENV{GLUT_LOCATION}/lib"
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/openwin/lib /usr/openwin/lib
/usr/X11R6/lib /usr/X11R6/lib
) )
find_library( GLUT_Xmu_LIBRARY Xmu find_library( GLUT_Xmu_LIBRARY Xmu
${GLUT_LOCATION}/lib "${GLUT_LOCATION}/lib"
$ENV{GLUT_LOCATION}/lib "$ENV{GLUT_LOCATION}/lib"
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/openwin/lib /usr/openwin/lib