tweaks to GLEW and freeglut find modules

This commit is contained in:
Stephen Birarda 2014-03-07 11:57:20 -08:00
parent bcaaa56b3d
commit 0ec0a87849
2 changed files with 2 additions and 3 deletions

View file

@ -26,7 +26,7 @@ else ()
set(WIN_ARCH_DIR "Win32")
endif()
find_library(GLEW_LIBRARY "lib/Release/${WIN_ARCH_DIR}/glew32s.lib" HINTS ${WIN_GLEW_SEARCH_DIRS})
find_library(GLEW_LIBRARY glew32 PATH_SUFFIXES "lib/Release/${WIN_ARCH_DIR}" HINTS ${WIN_GLEW_SEARCH_DIRS})
endif ()
include(FindPackageHandleStandardArgs)

View file

@ -23,7 +23,7 @@ elseif()
set(WIN_ARCH_DIR "lib")
endif()
find_library(GLUT_glut_LIBRARY "${WIN_ARCH_DIR}/freeglut.lib" HINTS ${WIN_GLUT_SEARCH_DIRS})
find_library(GLUT_glut_LIBRARY freeglut PATH_SUFFIXES ${WIN_ARCH_DIR} HINTS ${WIN_GLUT_SEARCH_DIRS})
else ()
find_path(GLUT_INCLUDE_DIR GL/glut.h
"${GLUT_LOCATION}/include"
@ -71,7 +71,6 @@ elseif()
endif ()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GLUT DEFAULT_MSG GLUT_INCLUDE_DIR GLUT_LIBRARIES)
if (GLUT_FOUND)