Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup in GLUT find module

Browse source
This commit is contained in:
Stephen Birarda 2014-03-07 11:51:35 -08:00
parent 3b9ae75162
commit bcaaa56b3d
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmake/modules/FindGLUT.cmake
View file

@ -25,7 +25,7 @@ elseif()
find_library(GLUT_glut_LIBRARY "${WIN_ARCH_DIR}/freeglut.lib" HINTS ${WIN_GLUT_SEARCH_DIRS}) find_library(GLUT_glut_LIBRARY "${WIN_ARCH_DIR}/freeglut.lib" HINTS ${WIN_GLUT_SEARCH_DIRS})
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
@ -67,15 +67,7 @@ elseif()
if(GLUT_INCLUDE_DIR AND GLUT_glut_LIBRARY) if(GLUT_INCLUDE_DIR AND 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 ${GLUT_glut_LIBRARY} ${GLUT_Xmu_LIBRARY} ${GLUT_Xi_LIBRARY})
${GLUT_glut_LIBRARY}
${GLUT_Xmu_LIBRARY}
${GLUT_Xi_LIBRARY}
)
set(GLUT_FOUND TRUE)
set(GLUT_LIBRARY ${GLUT_LIBRARIES})
set(GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
endif () endif ()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
@ -84,7 +76,7 @@ elseif()
if (GLUT_FOUND) if (GLUT_FOUND)
if (NOT GLUT_FIND_QUIETLY) if (NOT GLUT_FIND_QUIETLY)
message(STATUS "Found GLUT: ${GLUT_LIBRARY}") message(STATUS "Found GLUT: ${GLUT_LIBRARIES}")
endif () endif ()
else () else ()
if (GLUT_FIND_REQUIRED) if (GLUT_FIND_REQUIRED)